组织人员树

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")
+    @GetMapping("/deptUserTree/roleIds/{roleIds}")
-    public AjaxResult deptUserTreeInRoleIds(SysDept dept, List<Long> 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);
         }

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查询部门树信息
      * 

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);
+
     /**
      * 构建前端所需要树结构
      * 

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);
+    }
+
     /**
      * 查询部门人员树结构信息
      *

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,