tiyan

src/main/java/com/dk/mdm/mapper/mst/StaffRightMapper.xml

@@ -72,7 +72,7 @@
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_staff_right
+        FROM dkic_b.t_mst_staff_right
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -83,7 +83,7 @@
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM t_mst_staff_right
+        FROM dkic_b.t_mst_staff_right
         <include refid="Condition"/>
     </select>
 
@@ -91,7 +91,7 @@
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_staff_right
+        FROM dkic_b.t_mst_staff_right
         WHERE staff_id = #{id}::uuid
     </select>
 
@@ -99,7 +99,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_staff_right
+        FROM dkic_b.t_mst_staff_right
         WHERE staff_id = #{staffId}
         for update
     </select>
@@ -108,14 +108,14 @@
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_staff_right
+        FROM dkic_b.t_mst_staff_right
         <include refid="idsForeach"/>
         for update
     </select>
 
     <!--    批量插入-->
     <insert id="insertBatch">
-        insert into t_mst_staff_right
+        insert into dkic_b.t_mst_staff_right
         (
         <trim suffixOverrides=",">
             fun_uuid,
@@ -157,14 +157,18 @@
                menu.fun_uuid                                                  AS "funUuid",
                CASE WHEN staffRight.staff_id IS NULL THEN FALSE ELSE TRUE END AS "checked"
         FROM sys.t_app_menu menu
-                 inner JOIN dkic_b.t_mst_role_fun roleFun ON menu.fun_uuid = roleFun.fun_uuid and roleFun.role_id::uuid =  any ( (
-                 select  role_ids from dkic_b.t_mst_staff where staff_id = #{staffId}::uuid)::uuid[])
             left JOIN dkic_b.t_mst_staff_right staffRight
         ON menu.fun_uuid = staffRight.fun_uuid and staffRight.staff_id = #{staffId}::uuid
 
         WHERE menu.flg_valid
           AND menu.flg_right
           AND menu.object_code != 'home'
+            <if test="appCode != null">
+                AND menu.app_code = #{appCode}
+            </if>
+            <if test="searchText != null">
+                AND menu.menu_name  LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+            </if>
         ORDER BY menu.level_code;
     </select>
 

src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -241,7 +241,9 @@ public class StaffService extends BaseService<Staff> {
             staffRight.setRightType(1);
             staffRight.setCpId(staff.getCpId());
         }
-        staffRightService.saveStaffRight(staffVO.getStaffRightList());
+         if (staffVO.getStaffRightList()!=null && staffVO.getStaffRightList().size() > 0) {
+             staffRightService.saveStaffRight(staffVO.getStaffRightList());
+         }
         return ResponseResultUtil.success();
     }