部门人员树

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java

@@ -127,6 +127,15 @@ public interface RemoteUserService
     @GetMapping("/user/deptTree")
     public AjaxResult deptTree(SysDept dept, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    /**
+     * 获取当前登录用户数据权限范围内的部门权限下的部门人员树列表
+     * @param dept 部门信息
+     * @param source 请求来源
+     * @return 部门人员树列表或失败消息
+     */
+    @GetMapping("/user/deptUserTree")
+    public AjaxResult deptUserTree(SysDept dept, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
     /**
      * 修改用户审批状态
      * @param user 用户信息

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java

@@ -95,6 +95,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
                 return AjaxResult.error("获取部门权限下的部门树列表:" + throwable.getMessage());
             }
 
+            @Override
+            public AjaxResult deptUserTree(SysDept dept, String source) {
+                return AjaxResult.error("获取部门权限下的部门人员树列表:" + throwable.getMessage());
+            }
+
             @Override
             public AjaxResult approvalStatus(SysUser user, String source) {
                 return AjaxResult.error("修改用户审批状态失败:" + throwable.getMessage());

bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/vo/TreeSelect.java

@@ -22,6 +22,9 @@ public class TreeSelect implements Serializable {
      */
     private Long id;
 
+    /** 父部门ID */
+    private Long parentId;
+
     /**
      * 节点名称
      */
@@ -44,6 +47,7 @@ public class TreeSelect implements Serializable {
 
     public TreeSelect(SysDept dept) {
         this.id = dept.getDeptId();
+        this.parentId = dept.getParentId();
         this.status = dept.getStatus();
         this.label = dept.getDeptName();
         this.sysUsers = dept.getSysUsers();
@@ -65,6 +69,14 @@ public class TreeSelect implements Serializable {
         this.id = id;
     }
 
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
     public String getLabel() {
         return label;
     }

bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java

@@ -91,9 +91,11 @@ public class SysDeptServiceImpl implements ISysDeptService
             List<SysUser> users = userMapper.selectUserList(paramUser);
 
             List<SysUser> sysUsers = new ArrayList<>();
-            for (SysUser sysUser : users) {
-                if (sysUser.getDeptId().equals(sysDept.getDeptId())) {
-                    sysUsers.add(sysUser);
+            for (SysUser user : users) {
+                List<Long> roleIds = roleMapper.selectRoleListByUserId(user.getUserId());
+                user.setRoleIds(roleIds.toArray(new Long[roleIds.size()]));
+                if (user.getDeptId().equals(sysDept.getDeptId())) {
+                    sysUsers.add(user);
                 }
             }
             sysDept.setSysUsers(sysUsers);