From 00d9353c4f980d10a7ef1ae6d703f4d2c027598b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 13 Oct 2021 14:24:20 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=B9=E6=8D=AE=E8=A7=92=E8=89=B2id?=
 =?UTF-8?q?=E5=92=8C=E9=83=A8=E9=97=A8id=E8=8E=B7=E5=8F=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=20=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/controller/SysUserController.java   | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

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<List<SysUserVo>> queryListByRoleAndDepart(SysUser user,HttpServletRequest req) {
         String roleId = req.getParameter("roleId");
         String departId = req.getParameter("departId");
         Page<SysUserVo> page = new Page<>(-1, -1);
         IPage<SysUserVo> pageList = sysUserService.queryPageListByRoleAndDepart(page, user, roleId, departId);
-        List<SysUserVo> userList = new ArrayList<>();
-        for (SysUserVo record : pageList.getRecords()) {
-            //处理邮箱和手机号的加密
-            UserUtil.decryptUser(record);
-            userList.add(record);
-        }
+        List<SysUserVo> userList = pageList.getRecords();
         //批量查询用户的所属部门
         //step.1 先拿到全部的 useids
         //step.2 通过 useids，一次性查询用户的所属部门名字
         List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
         if (userIds != null && userIds.size() > 0) {
             Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
-            Map<String, String> roleNames = sysUserService.getRoleNameByUserIds(userIds);
             userList.forEach(item -> {
                 item.setOrgCodeTxt(useDepNames.get(item.getId()));
-                item.setRoleName(roleNames.get(item.getId()));
             });
         }
         return Result.OK(userList);