From 237c9b4b53914fbfa2840ce53b379dda19a35201 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Mon, 19 Sep 2022 11:14:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.2.5=E3=80=91=E3=80=90user=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E4=B8=8B=E6=8B=89=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9D=A1=E4=BB=B6=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/service/impl/SysUserServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java index 9f4f2682a..49f303d96 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java @@ -452,9 +452,7 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUserRequest.setUserScopeIds(null); } // 如果是按部门数据划分 - else if (dataScopeTypeEnums.contains(DataScopeTypeEnum.DEPT) - || dataScopeTypeEnums.contains(DataScopeTypeEnum.DEPT_WITH_CHILD) - || dataScopeTypeEnums.contains(DataScopeTypeEnum.DEFINE)) { + else if (dataScopeTypeEnums.contains(DataScopeTypeEnum.DEPT) || dataScopeTypeEnums.contains(DataScopeTypeEnum.DEPT_WITH_CHILD) || dataScopeTypeEnums.contains(DataScopeTypeEnum.DEFINE)) { sysUserRequest.setScopeOrgIds(dataScopeOrganizationIds); sysUserRequest.setUserScopeIds(null); } @@ -750,7 +748,8 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUserLambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(statusFlag), SysUser::getStatusFlag, statusFlag); // 按条件查询的 - sysUserLambdaQueryWrapper.nested(ObjectUtil.isNotEmpty(condition), i -> i.like(SysUser::getRealName, condition).or(j -> j.like(SysUser::getAccount, condition))); + sysUserLambdaQueryWrapper.nested(ObjectUtil.isNotEmpty(condition), i -> i.like(SysUser::getRealName, condition) + .or(j -> j.like(SysUser::getAccount, condition))); List list = this.list(sysUserLambdaQueryWrapper); ArrayList results = new ArrayList<>(); @@ -1033,6 +1032,12 @@ public class SysUserServiceImpl extends ServiceImpl impl queryWrapper.like(ObjectUtil.isNotEmpty(sysUserRequest.getAccount()), SysUser::getAccount, sysUserRequest.getAccount()); queryWrapper.like(ObjectUtil.isNotEmpty(sysUserRequest.getRealName()), SysUser::getRealName, sysUserRequest.getRealName()); + // 根据text查询 + if (ObjectUtil.isNotEmpty(sysUserRequest.getSearchText())) { + queryWrapper.like(SysUser::getAccount, sysUserRequest.getSearchText()).or().like(SysUser::getRealName, sysUserRequest.getSearchText()).or() + .like(SysUser::getNickName, sysUserRequest.getSearchText()); + } + return queryWrapper; }