From 7e3ce9a0e62e36b444606547b441ed8a7b5c8b84 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 30 Aug 2021 18:36:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=83=A8=E9=97=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=BD=BF=E7=94=A8=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java     | 16 ++++++----------
 .../modules/system/mapper/xml/SysUserMapper.xml  |  2 +-
 2 files changed, 7 insertions(+), 11 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 f03dc699..4836de1e 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
@@ -834,20 +834,17 @@ public class SysUserController {
     @RequestMapping(value = "/departUserList", method = RequestMethod.GET)
     @RequiresPermissions("sys:user:list")
     public Result<IPage<SysUser>> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
-        Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
+                                                 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                 HttpServletRequest req) {
+        Result<IPage<SysUser>> result = new Result<>();
         Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
         String depId = req.getParameter("depId");
         String username = req.getParameter("username");
         //根据部门ID查询,当前和下级所有的部门IDS
         List<String> subDepids = new ArrayList<>();
-        //部门id为空时，查询我的部门下所有用户
+        //部门id为空时，返回空
         if(oConvertUtils.isEmpty(depId)){
-            LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            int userIdentity = user.getUserIdentity() != null?user.getUserIdentity():CommonConstant.USER_IDENTITY_1;
-            if(oConvertUtils.isNotEmpty(userIdentity) && userIdentity == CommonConstant.USER_IDENTITY_2 ){
-                subDepids = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds());
-            }
+            return result;
         }else{
             subDepids = sysDepartService.getSubDepIdsByDepId(depId);
         }
@@ -855,8 +852,7 @@ public class SysUserController {
             IPage<SysUser> pageList = sysUserService.getUserByDepIds(page,subDepids,username);
             List<SysUser> userList = new ArrayList<>();
             for (SysUser record : pageList.getRecords()) {
-                record.setEmail(PasswordUtil.decrypt(record.getEmail()));
-                record.setPhone(PasswordUtil.decrypt(record.getPhone()));
+                UserUtil.decryptUser(record);
                 userList.add(record);
             }
             pageList.setRecords(userList);
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
index 24af04fc..bcbb7520 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
@@ -34,7 +34,7 @@
 			)
 		</if>
 		<if test="username!=null and username!=''">
-			and username = #{username}
+			and username like concat('%',#{username},'%')
 		</if>
 	</select>