From 7a11f91e0d07aff4d9defe68ac1af7c39888e53b Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 16 Oct 2024 17:34:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BA=BA=E5=91=98=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/system/api/RemoteUserService.java |  9 +++++++++
 .../api/factory/RemoteUserFallbackFactory.java       |  5 +++++
 .../java/com/bonus/system/domain/vo/TreeSelect.java  | 12 ++++++++++++
 .../system/service/impl/SysDeptServiceImpl.java      |  8 +++++---
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java
index ba1eec8..16a3ab7 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java
+++ b/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 用户信息
diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java
index c516555..9b7577f 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java
+++ b/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());
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/vo/TreeSelect.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/vo/TreeSelect.java
index 0a7b955..25ecf19 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/vo/TreeSelect.java
+++ b/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;
     }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
index c76d5f5..0574e73 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
+++ b/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);