根据组织ID和角色编码列表查询用户列表

airport-system/src/main/java/com/sundot/airport/system/mapper/SysUserMapper.java

@@ -171,11 +171,11 @@ public interface SysUserMapper {
      * @return 用户列表
      */
     public List<SysUser> selectUserListByRoleKey(@Param("list") List<String> list);
-    
+
     /**
      * 根据角色标识和站点ID查询用户列表
      *
-     * @param list 角色标识
+     * @param list      角色标识
      * @param stationId 站点ID
      * @return 用户列表
      */
@@ -203,4 +203,13 @@ public interface SysUserMapper {
      * @return 用户信息集合
      */
     public List<SysUser> selectUserAll();
+
+    /**
+     * 根据组织ID和角色编码列表查询用户列表
+     *
+     * @param deptId 组织ID
+     * @param list   角色编码列表
+     * @return 用户信息集合
+     */
+    public List<SysUser> selectUserByDeptIdAndRoleKeyList(@Param("deptId") Long deptId, @Param("list") List<String> list);
 }

airport-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -618,25 +618,25 @@
             #{subordinateEvaluationGrowthPotential},
         </if>
         <if test="schooling != null and schooling != ''">
-             #{schooling},
+            #{schooling},
         </if>
         <if test="politicalReviewSituation != null and politicalReviewSituation != ''">
-             #{politicalReviewSituation},
+            #{politicalReviewSituation},
         </if>
         <if test="startWorkingDate != null">
-             #{startWorkingDate},
+            #{startWorkingDate},
         </if>
         <if test="securityCheckStartDate != null">
-             #{securityCheckStartDate},
+            #{securityCheckStartDate},
         </if>
         <if test="securityInspectionPosition != null and securityInspectionPosition != ''">
-             #{securityInspectionPosition},
+            #{securityInspectionPosition},
         </if>
         <if test="workRewardsNumber != null ">
-             #{workRewardsNumber},
+            #{workRewardsNumber},
         </if>
         <if test="workPenaltiesNumber != null">
-             #{workPenaltiesNumber},
+            #{workPenaltiesNumber},
         </if>
         sysdate()
         )
@@ -969,10 +969,22 @@
         and su.status = '0'
         and sr.del_flag = '0'
         and sr.status = '0'
-        and (su.dept_id = #{deptId} OR d.parent_id = #{deptId} OR d.ancestors like concat('%,', #{deptId}, ',%') OR d.ancestors like concat(#{deptId}, ',%') OR d.ancestors like concat('%,', #{deptId}))
+        and (su.dept_id = #{deptId} OR d.parent_id = #{deptId} OR d.ancestors like concat('%,', #{deptId}, ',%') OR
+        d.ancestors like concat(#{deptId}, ',%') OR d.ancestors like concat('%,', #{deptId}))
         and sr.role_key in
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
     </select>
+
+    <select id="selectUserByDeptIdAndRoleKeyList" resultMap="SysUserResult">
+        <include refid="selectUserVo"/>
+        where (u.dept_id = #{deptId} OR u.dept_id IN (
+        SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors)))
+        and u.del_flag = '0'
+        and r.role_key in
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>