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 users = userMapper.selectUserList(paramUser); List sysUsers = new ArrayList<>(); - for (SysUser sysUser : users) { - if (sysUser.getDeptId().equals(sysDept.getDeptId())) { - sysUsers.add(sysUser); + for (SysUser user : users) { + List 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);