From 108846a126fbb9f70184269d2dbb091047bce521 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 1 Nov 2024 14:01:26 +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/controller/SysUserController.java    | 6 +++---
 .../main/java/com/bonus/system/mapper/SysDeptMapper.java  | 2 ++
 .../java/com/bonus/system/service/ISysDeptService.java    | 2 ++
 .../com/bonus/system/service/impl/SysDeptServiceImpl.java | 8 ++++++++
 .../src/main/resources/mapper/system/SysDeptMapper.xml    | 2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java
index 9c6d7e1..bc58460 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java
@@ -467,10 +467,10 @@ public class SysUserController extends BaseController {
      * 根据角色列表获取部门人员树列表
      */
     @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list"))
-    @GetMapping("/deptUserTreeInRoleIds")
-    public AjaxResult deptUserTreeInRoleIds(SysDept dept, List<Long> roleIds) {
+    @GetMapping("/deptUserTree/roleIds/{roleIds}")
+    public AjaxResult deptUserTreeInRoleIds(@PathVariable("roleIds") Long[] roleIds) {
         try {
-            return success(deptService.selectDeptUserTree(dept, roleIds));
+            return success(deptService.selectDeptUserTree(roleIds));
         } catch (Exception e) {
             logger.error(e.toString(), e);
         }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java
index 977c40f..3241a5e 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java
@@ -28,6 +28,8 @@ public interface SysDeptMapper
      */
     public List<SysDept> selectDeptUserList(SysDept dept, @Param("roleIds") List<Long> roleIds);
 
+    public List<SysDept> selectDeptUserList(@Param("roleIds") Long[] roleIds);
+
     /**
      * 根据角色ID查询部门树信息
      * 
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java
index 53c8f88..580b724 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java
@@ -44,6 +44,8 @@ public interface ISysDeptService
      */
     public List<TreeSelect> selectDeptUserTree(SysDept dept, List<Long> roleIds);
 
+    public List<TreeSelect> selectDeptUserTree(Long[] roleIds);
+
     /**
      * 构建前端所需要树结构
      * 
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 1fa5644..3449e86 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
@@ -90,6 +90,14 @@ public class SysDeptServiceImpl implements ISysDeptService
         return buildDeptTreeSelect(depts);
     }
 
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<TreeSelect> selectDeptUserTree(Long[] roleIds)
+    {
+        List<SysDept> depts = deptMapper.selectDeptUserList(roleIds);
+        return buildDeptTreeSelect(depts);
+    }
+
     /**
      * 查询部门人员树结构信息
      *
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 74ba285..c8a483f 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by d.parent_id, d.order_num
     </select>
 
-	<select id="selectDeptUserList" parameterType="com.bonus.system.api.domain.SysDept" resultMap="SysDeptResult">
+	<select id="selectDeptUserList" resultType="com.bonus.system.api.domain.SysDept">
 		SELECT
 			d.dept_id AS deptId,
 			d.parent_id AS parentId,