From bc1431d55206a8c5506bd3f2338852b5e2e9fc1d Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 20 九月 2023 15:12:25 +0800 Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev --- server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java index b1136c1..8ad34f5 100644 --- a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java @@ -224,11 +224,8 @@ MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(SystemUser.class); - queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO); - queryWrapper.and(StringUtils.isNotBlank(pageWrap.getUsername()),ms->ms.like(SystemUser::getUsername,pageWrap.getUsername()) - .or().like(SystemUser::getMobile,pageWrap.getUsername()) - .or().like(SystemUser::getRealname,pageWrap.getUsername()) - ); + queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO) + .eq(SystemUser::getType,pageWrap.getType()); queryWrapper.orderByDesc(SystemUser::getCreateTime); List<SystemUser> result = systemUserJoinMapper.selectJoinList(SystemUser.class, queryWrapper); -- Gitblit v1.9.3