获取部门及用户树列表新版

airport-common/src/main/java/com/sundot/airport/common/core/domain/DeptAndUserTreeSelect.java

@@ -1,13 +1,17 @@
 package com.sundot.airport.common.core.domain;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.sundot.airport.common.constant.UserConstants;
 import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysRole;
 import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.common.utils.StringUtils;
 import lombok.Data;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 部门用户树结构实体类新版
@@ -53,6 +57,11 @@ public class DeptAndUserTreeSelect {
     private String deptType;
 
     /**
+     * 角色列表
+     */
+    private String roles;
+
+    /**
      * 子节点
      */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -85,6 +94,14 @@ public class DeptAndUserTreeSelect {
         this.setId(user.getUserId());
         this.setLabel(user.getNickName());
         this.setParentId(user.getDeptId());
+        if (CollUtil.isNotEmpty(user.getRoles())) {
+            List<SysRole> filterList = user.getRoles().stream()
+                    .filter(role -> StrUtil.equals(role.getRoleName(), "站长") || StrUtil.equals(role.getRoleName(), "部门经理") || StrUtil.equals(role.getRoleName(), "班组长"))
+                    .collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(filterList)) {
+                this.setRoles(filterList.stream().map(SysRole::getRoleName).collect(Collectors.joining("、")));
+            }
+        }
         this.setNodeType("user");
     }
 

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

@@ -254,4 +254,12 @@ public interface SysUserMapper {
      * @return 用户信息列表
      */
     public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfoByDepartmentId(@Param("departmentId") Long departmentId);
+
+    /**
+     * 根据部门ID查询用户列表新
+     *
+     * @param deptId 部门ID
+     * @return 用户列表
+     */
+    public List<SysUser> selectUsersByDeptIdNew(@Param("deptId") Long deptId);
 }

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

@@ -831,7 +831,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
                     .collect(Collectors.toList()));
         }
 
-        List<SysUser> users = userMapper.selectUsersByDeptId(dept.getDeptId());
+        List<SysUser> users = userMapper.selectUsersByDeptIdNew(dept.getDeptId());
         if (users != null && !users.isEmpty()) {
             List<DeptAndUserTreeSelect> userChildren = users.stream()
                     .map(DeptAndUserTreeSelect::new)

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

@@ -1158,4 +1158,50 @@
           and sr.role_key in ('banzuzhang', 'SecurityCheck')
           and sd_ks.dept_id = #{departmentId}
     </select>
+
+    <select id="selectUsersByDeptIdNew" parameterType="Long" resultMap="SysUserResult">
+        select u.user_id,
+               u.dept_id,
+               u.user_name,
+               u.nick_name,
+               u.email,
+               u.avatar,
+               u.phonenumber,
+               u.password,
+               u.sex,
+               u.status,
+               u.del_flag,
+               u.login_ip,
+               u.login_date,
+               u.pwd_update_date,
+               u.create_by,
+               u.create_time,
+               u.remark,
+               u.card_number,
+               u.political_status,
+               u.training_compliance_status,
+               u.qualification_level,
+               u.administrative_status,
+               u.physical_health_status,
+               u.emergency_contact_name,
+               u.emergency_contact_phone,
+               u.emergency_contact_relationship,
+               d.dept_id,
+               d.parent_id,
+               d.ancestors,
+               d.dept_name,
+               d.order_num,
+               d.leader,
+               d.status as dept_status,
+               sr.role_id,
+               sr.role_key,
+               sr.role_name
+        from sys_user u
+                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_user_role sur on sur.user_id = u.user_id
+                 left join sys_role sr on sr.role_id = sur.role_id
+        where u.del_flag = '0'
+          and u.status = '0'
+          and u.dept_id = #{deptId}
+    </select>
 </mapper>