查询用户列表接口

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysUserController.java

@@ -20,6 +20,7 @@ import com.sundot.airport.check.domain.CheckLargeScreenCorrectionQueryParamDto;
 import com.sundot.airport.common.core.domain.ResetUserPostDto;
 import com.sundot.airport.common.core.domain.ResetUserRoleDto;
 import com.sundot.airport.common.core.domain.SysLargeScreenWorkingPortraitDto;
+import com.sundot.airport.common.dto.SysUserConditionDto;
 import com.sundot.airport.common.enums.RoleTypeEnum;
 import com.sundot.airport.exam.domain.DailyTask;
 import com.sundot.airport.attendance.portrait.AttendanceModuleIndicatorResult;
@@ -150,6 +151,15 @@ public class SysUserController extends BaseController {
     }
 
     /**
+     * 查询用户列表
+     */
+    @PostMapping("/selectUserListByCondition")
+    public AjaxResult selectUserListByCondition(@RequestBody SysUserConditionDto dto) {
+        List<SysUser> result = userService.selectUserListByDeptIdAndRoleKeyListAndUserName(dto);
+        return success(result);
+    }
+
+    /**
      * 能力画像-协同配合
      */
     @Cacheable(

airport-common/src/main/java/com/sundot/airport/common/dto/SysUserConditionDto.java

@@ -0,0 +1,31 @@
+package com.sundot.airport.common.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 查询用户列表参数
+ *
+ * @Author: wangchong
+ * @Date: 2025/7/15 16:12
+ **/
+@Data
+public class SysUserConditionDto {
+
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
+    /**
+     * 角色编码列表
+     */
+    private List<String> roleKeyList;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+}

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

@@ -220,4 +220,14 @@ public interface SysUserMapper {
      * @return 首页-用户信息
      */
     public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfo();
+
+    /**
+     * 根据组织ID和角色编码列表和用户昵称查询用户列表
+     *
+     * @param deptId   组织ID
+     * @param list     角色编码列表
+     * @param nickName 用户昵称
+     * @return 用户信息集合
+     */
+    public List<SysUser> selectUserListByDeptIdAndRoleKeyListAndUserName(@Param("deptId") Long deptId, @Param("list") List<String> list, @Param("nickName") String nickName);
 }

airport-system/src/main/java/com/sundot/airport/system/service/ISysUserService.java

@@ -7,6 +7,7 @@ import com.sundot.airport.common.core.domain.LargeScreenHomePageUserInfoSqlDto;
 import com.sundot.airport.common.core.domain.ResetUserPostDto;
 import com.sundot.airport.common.core.domain.ResetUserRoleDto;
 import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.dto.SysUserConditionDto;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationDto;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationQueryParamDto;
 
@@ -311,4 +312,12 @@ public interface ISysUserService {
      * @return 结果
      */
     public int resetUserPostByDept(ResetUserPostDto resetUserPostDto);
+
+    /**
+     * 查询用户列表
+     *
+     * @param dto 查询用户列表参数
+     * @return 用户信息集合
+     */
+    public List<SysUser> selectUserListByDeptIdAndRoleKeyListAndUserName(SysUserConditionDto dto);
 }

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysUserServiceImpl.java

@@ -23,6 +23,7 @@ import com.sundot.airport.common.core.domain.ResetUserPostDto;
 import com.sundot.airport.common.core.domain.ResetUserRoleDto;
 import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysDictData;
+import com.sundot.airport.common.dto.SysUserConditionDto;
 import com.sundot.airport.common.dto.UserInfo;
 import com.sundot.airport.common.enums.DeptType;
 import com.sundot.airport.common.enums.RoleTypeEnum;
@@ -1174,4 +1175,15 @@ public class SysUserServiceImpl implements ISysUserService {
         }
         return 1;
     }
+
+    /**
+     * 查询用户列表
+     *
+     * @param dto 查询用户列表参数
+     * @return 用户信息集合
+     */
+    @Override
+    public List<SysUser> selectUserListByDeptIdAndRoleKeyListAndUserName(SysUserConditionDto dto) {
+        return userMapper.selectUserListByDeptIdAndRoleKeyListAndUserName(dto.getDeptId(), dto.getRoleKeyList(), dto.getNickName());
+    }
 }

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

@@ -988,6 +988,20 @@
         </foreach>
     </select>
 
+    <select id="selectUserListByDeptIdAndRoleKeyListAndUserName" 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>
+        <if test="nickName != null and nickName != ''">
+            and u.nick_name like concat('%', #{nickName}, '%')
+        </if>
+    </select>
+
     <select id="homePageUserInfo" resultType="com.sundot.airport.common.core.domain.LargeScreenHomePageUserInfoSqlDto">
         select su.user_id      userId,
                su.user_name    userName,