Merge branch 'V20230915' of 192.168.60.201:root/dsk-operate-sys into V20230915

dsk-system/src/main/java/com/dsk/system/service/impl/SysUserServiceImpl.java

@@ -79,8 +79,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         QueryWrapper<SysUser> wrapper = Wrappers.query();
         wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
                 .eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId())
-                .like(StringUtils.isNotBlank(user.getUserName()), "u.nick_name", user.getUserName())
                 .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
+                .like(StringUtils.isNotBlank(user.getUserName()), "u.nick_name", user.getUserName())
                 .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
                 .between(params.get("beginTime") != null && params.get("endTime") != null,
                         "u.create_time", params.get("beginTime"), params.get("endTime"))
@@ -92,6 +92,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
                     ids.add(user.getDeptId());
                     w.in("u.dept_id", ids);
                 })
+                .or()
+                .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
                 .orderByDesc("u.create_time");
         return wrapper;
     }