fix 部门查询用户信息使用模糊查询

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);

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>