From a2735382e853f89465e328dce2df9f3f465bcda9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 20 九月 2023 17:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' 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