From 1505f5107a09dfe218557f67f2a1c9bdd2a1ba6a Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Thu, 29 Jun 2023 11:58:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?= =?UTF-8?q?=E3=80=90user=E3=80=91=E6=9B=B4=E6=96=B0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=A1=E4=BB=B6=E6=8B=BC=E6=8E=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/service/impl/SysUserServiceImpl.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java index e770d747b..ce5a1b32d 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -451,19 +451,18 @@ public class SysUserServiceImpl extends ServiceImpl impl // 根据输入内容进行查询 String searchText = sysUserRequest.getSearchText(); if (ObjectUtil.isNotEmpty(searchText)) { - queryWrapper.like(SysUser::getRealName, searchText); - queryWrapper.or().like(SysUser::getAccount, searchText); - queryWrapper.or().like(SysUser::getPhone, searchText); - queryWrapper.or().like(SysUser::getTel, searchText); + queryWrapper.nested(wrap -> { + wrap.like(SysUser::getRealName, searchText); + wrap.or().like(SysUser::getAccount, searchText); + wrap.or().like(SysUser::getPhone, searchText); + wrap.or().like(SysUser::getTel, searchText); + }); } // 根据状态进行查询 Integer statusFlag = sysUserRequest.getStatusFlag(); queryWrapper.eq(ObjectUtil.isNotEmpty(statusFlag), SysUser::getStatusFlag, statusFlag); - // 按用户排序字段排序 - queryWrapper.orderByAsc(SysUser::getUserSort); - // 如果传递了组织机构id查询条件，则查询对应机构id下有哪些用户，再拼接用户查询条件 if (ObjectUtil.isNotEmpty(sysUserRequest.getOrgIdCondition())) { List orgUserIdList = this.sysUserOrgService.getOrgUserIdList(sysUserRequest.getOrgIdCondition(), true); @@ -474,9 +473,11 @@ public class SysUserServiceImpl extends ServiceImpl impl } else { queryWrapper.in(SysUser::getUserId, orgUserIdList); } - } + // 按用户排序字段排序 + queryWrapper.orderByAsc(SysUser::getUserSort); + return queryWrapper; }