From db826998a06050d8f37889ae0cdefa7407b91fc3 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 1 Nov 2024 11:17:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=BA=E5=91=98=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/system/api/RemoteUserService.java   | 15 ++++++++++++++-
 .../api/factory/RemoteUserFallbackFactory.java    |  7 ++++++-
 2 files changed, 20 insertions(+), 2 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 24d567e..35afeef 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
@@ -13,6 +13,8 @@ import com.bonus.system.api.domain.SysUser;
 import com.bonus.system.api.factory.RemoteUserFallbackFactory;
 import com.bonus.system.api.model.LoginUser;
 
+import java.util.List;
+
 /**
  * 用户服务
  *
@@ -160,7 +162,7 @@ public interface RemoteUserService {
     public AjaxResult deptTree(SysDept dept, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
-     * 获取当前登录用户数据权限范围内的部门权限下的部门人员树列表
+     * 查询部门人员树列表
      *
      * @param dept   部门信息
      * @param source 请求来源
@@ -169,6 +171,17 @@ public interface RemoteUserService {
     @GetMapping("/user/deptUserTree")
     public AjaxResult deptUserTree(SysDept dept, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    /**
+     * 根据角色查询部门人员树列表
+     *
+     * @param dept   部门信息
+     * @param roleIds 角色列表
+     * @param source 请求来源
+     * @return 部门人员树列表或失败消息
+     */
+    @GetMapping("/user/deptUserTree")
+    public AjaxResult deptUserTree(SysDept dept, List<Long> roleIds, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
     /**
      * 修改用户审批状态
      *
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 a84c63c..27e79b3 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
@@ -126,7 +126,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
 
             @Override
             public AjaxResult deptUserTree(SysDept dept, String source) {
-                return AjaxResult.error("获取部门权限下的部门人员树列表:" + throwable.getMessage());
+                return AjaxResult.error("获取部门人员树列表:" + throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult deptUserTree(SysDept dept, List<Long> roleIds, String source) {
+                return AjaxResult.error("根据角色列表获取部门人员树列表:" + throwable.getMessage());
             }
 
             @Override