From 0a1b58078a954d47f59b6b1005aa06d29e1ba710 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 7 Sep 2021 18:42:04 +0800
Subject: [PATCH] =?UTF-8?q?add=20SysUserController.java=20[queryListByRole?=
 =?UTF-8?q?AndDepart]=E6=A0=B9=E6=8D=AE=E8=A7=92=E8=89=B2id=E5=92=8C?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8id=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java  | 34 +++++++++++++++++--
 .../jero/modules/system/util/UserUtil.java    |  3 ++
 2 files changed, 35 insertions(+), 2 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 fc13560b..1731b3eb 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
@@ -109,13 +109,12 @@ public class SysUserController {
     @RequiresPermissions("sys:user:list")
     @PermissionData(pageComponent = "system/UserList")
     @RequestMapping(value = "/pageRoleAndDepart", method = RequestMethod.GET)
-    public Result<IPage<SysUserVo>> queryPageListByRoleAndDepart(SysUser user,
+    public Result<IPage<SysUserVo>> queryPageByRoleAndDepart(SysUser user,
                                                                @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                                @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                                HttpServletRequest req) {
         String roleId = req.getParameter("roleId");
         String departId = req.getParameter("departId");
-        //TODO 外部模拟登陆临时账号，列表不显示
         Page<SysUserVo> page = new Page<>(pageNo, pageSize);
         IPage<SysUserVo> pageList = sysUserService.queryPageListByRoleAndDepart(page, user, roleId, departId);
         List<SysUserVo> userList = new ArrayList<>();
@@ -141,6 +140,37 @@ public class SysUserController {
         return Result.OK(pageList);
     }
 
+    /**
+     * 根据角色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);
+        }
+        //批量查询用户的所属部门
+        //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);
+    }
+
     /**
      * 获取用户列表数据
      * @param user
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/util/UserUtil.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/util/UserUtil.java
index 9d1a10d7..c5e9c3f5 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/util/UserUtil.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/util/UserUtil.java
@@ -25,6 +25,9 @@ public class UserUtil {
         if (StringUtils.isNotBlank(phone)){
             record.setPhone(PasswordUtil.decrypt(phone));
         }
+        //接口调用查询返回结果不能返回密码相关信息
+        record.setSalt("");
+        record.setPassword("");
     }
 
     /**