diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index c94c4967..2ec0170e 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -146,29 +146,21 @@ public class SysUserController { /** * 根据角色id和部门id获取用户列表数据 */ - @RequiresPermissions("sys:user:list") @RequestMapping(value = "/listRoleAndDepart", method = RequestMethod.GET) public Result> queryListByRoleAndDepart(SysUser user,HttpServletRequest req) { String roleId = req.getParameter("roleId"); String departId = req.getParameter("departId"); Page page = new Page<>(-1, -1); IPage pageList = sysUserService.queryPageListByRoleAndDepart(page, user, roleId, departId); - List userList = new ArrayList<>(); - for (SysUserVo record : pageList.getRecords()) { - //处理邮箱和手机号的加密 - UserUtil.decryptUser(record); - userList.add(record); - } + List userList = pageList.getRecords(); //批量查询用户的所属部门 //step.1 先拿到全部的 useids //step.2 通过 useids,一次性查询用户的所属部门名字 List userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList()); if (userIds != null && userIds.size() > 0) { Map useDepNames = sysUserService.getDepNamesByUserIds(userIds); - Map roleNames = sysUserService.getRoleNameByUserIds(userIds); userList.forEach(item -> { item.setOrgCodeTxt(useDepNames.get(item.getId())); - item.setRoleName(roleNames.get(item.getId())); }); } return Result.OK(userList);