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 d6bbccc..08ba928 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 @@ -450,13 +450,13 @@ public class SysUserController extends BaseController { } /** - * 根据角色列表获取部门人员树列表 + * 查询部门人员树列表 */ @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list")) @PostMapping("/deptUserTree") public AjaxResult deptUserTree(@RequestBody SysUser sysUser) { try { - return success(deptService.selectDeptUserTree(sysUser.getRoleIds())); + return success(deptService.selectDeptUserTree(sysUser)); } catch (Exception e) { logger.error(e.toString(), e); } 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 ef90ed8..cc225d2 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 @@ -2,6 +2,7 @@ package com.bonus.system.service; import java.util.List; import com.bonus.system.api.domain.SysDept; +import com.bonus.system.api.domain.SysUser; import com.bonus.system.domain.vo.TreeSelect; /** @@ -28,12 +29,12 @@ public interface ISysDeptService public List selectDeptTreeList(SysDept dept); /** - * 根据角色列表查询部门人员树结构信息 + * 查询部门人员树列表 * - * @param roleIds 角色列表 + * @param sysUser 用户对象 * @return 部门树信息集合 */ - public List selectDeptUserTree(Long[] roleIds); + public List selectDeptUserTree(SysUser sysUser); /** * 构建前端所需要树结构 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 9e375b4..4b17086 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 @@ -76,16 +76,16 @@ public class SysDeptServiceImpl implements ISysDeptService } /** - * 根据角色列表查询部门人员树结构信息 + * 查询部门人员树列表 * - * @param roleIds 角色列表 + * @param sysUser 用户对象 * @return 部门树信息集合 */ @Override @DataScope(deptAlias = "d") - public List selectDeptUserTree(Long[] roleIds) + public List selectDeptUserTree(SysUser sysUser) { - List depts = deptMapper.selectDeptUserList(roleIds); + List depts = deptMapper.selectDeptUserList(sysUser.getRoleIds()); return buildDeptTreeSelect(depts); }