Merge branch 'develop_migration' into 'develop_master'

Develop migration

See merge request LiuChao/foton-slrs-system-rest!215

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsMenu/SarLawsMenuMapper.xml

@@ -159,11 +159,14 @@
     <select id="selectMenuByMenuParentId" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
         select <include refid="Base_Column_List"/> from SAR_LAWS_MENU
         where laws_id = #{lawsId} and valid_flag=0
-        and MENU_ID in (select SAR_MENU.id from SAR_MENU where VALID_FLAG=0 start with id=#{menuId} connect by prior id= parent_id)
+        and MENU_ID in
+        <foreach collection="menuIds" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
     </select>
 
     <update id="updateByLawsIdAndMenuId" parameterType="com.adc.da.slrs.sarLawsMenu.entity.SarLawsMenu" >
-        update SAR_BUSS_STAND_MENU
+        update SAR_LAWS_MENU
         <set >
             <if test="menuId != null" >
                 menu_id = #{menuId},
@@ -179,8 +182,10 @@
     <delete id="deleteByMenuId" parameterType="com.adc.da.slrs.sarLawsMenu.entity.SarLawsMenu">
         delete from SAR_LAWS_MENU
         where laws_id = #{lawsId}
-        and MENU_ID in (select SAR_MENU.id from SAR_MENU
-        where VALID_FLAG=0 start with id=#{oldMenuId} connect by prior id= parent_id)
+        and MENU_ID in
+        <foreach collection="menuIds" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
     </delete>
     <select id="selectAllMenuByStandId" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarLawsMenu.entity.SarLawsMenu">
         select <include refid="Base_Column_List" />

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml

@@ -78,7 +78,7 @@
     </sql>
 
     <sql id="SarStandardsInfo_in_left">
-        left join SAR_STAND_MENU ON SAR_LAWS_STAND_INFO.id = SAR_STAND_MENU.stand_id
+        left join SAR_LAWS_MENU ON SAR_LAWS_STAND_INFO.id = SAR_LAWS_MENU.laws_id
         where 1=1 and SAR_LAWS_STAND_INFO.valid_flag=0
         <trim suffixOverrides=",">
             <!--                     基本搜索项                         -->
@@ -146,7 +146,7 @@
             </if>
             <!--  目录判断 -->
             <if test="menuId != null and menuId !='nomenu' and menuAllChildrenIdList != null">
-                and SAR_STAND_MENU.MENU_ID in
+                and SAR_LAWS_MENU.MENU_ID in
                 <foreach collection="menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -154,7 +154,7 @@
             </if>
             <!--  新修改需求，根据角色查询有权限的菜单数据-->
             <if test="menuRoleList != null">
-                and SAR_STAND_MENU.MENU_ID in
+                and SAR_LAWS_MENU.MENU_ID in
                 <foreach collection="menuRoleList" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -226,8 +226,8 @@
         AND dicstandTextStatus.dic_id IS NOT NULL
         AND dicstandTextStatus.valid_flag = 0
         )
-        left join SAR_STAND_MENU ON SAR_LAWS_STAND_INFO.id = SAR_STAND_MENU.stand_id
-        left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id
+        left join SAR_LAWS_MENU ON SAR_LAWS_STAND_INFO.id = SAR_LAWS_MENU.laws_id
+        left join TS_RESOURCE on SAR_LAWS_MENU.menu_id = TS_RESOURCE.id
         where SAR_LAWS_STAND_INFO.id = #{id}
     </select>