From e362f74ee26bac9dbf2ce8ca97ce373ee1d22996 Mon Sep 17 00:00:00 2001 From: yangsb Date: Tue, 30 Apr 2024 16:12:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=94=A8=E6=88=B7=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2sql=20=EF=BC=8Cor=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/dal/mysql/user/AdminUserMapper.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java index 94ab1fb7c..05d2f5b1a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java @@ -14,6 +14,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.Collection; import java.util.List; import java.util.Objects; +import java.util.function.Consumer; @Mapper public interface AdminUserMapper extends BaseMapperX { @@ -50,11 +51,17 @@ public interface AdminUserMapper extends BaseMapperX { .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus()) .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime()) .inIfPresent(AdminUserDO::getDeptId, deptIds) - .likeIfPresent(AdminUserDO::getNickname, reqVO.getNickname()) - .or(StrUtil.isNotBlank(reqVO.getNickname())) - .likeIfPresent(AdminUserDO::getPinyinFull, reqVO.getPyAll()) - .or(StrUtil.isNotBlank(reqVO.getNickname())) - .likeIfPresent(AdminUserDO::getPinyinInitial, reqVO.getPyFirstChar()) + .and(StrUtil.isNotBlank(reqVO.getNickname()), wrapper -> { + if (StrUtil.isNotBlank(reqVO.getPyAll())) { + wrapper.or(Boolean.TRUE).like(AdminUserDO::getPinyinFull, reqVO.getPyAll()) ; + } + if (StrUtil.isNotBlank(reqVO.getPyFirstChar())) { + wrapper.or(Boolean.TRUE).like(AdminUserDO::getPinyinInitial, reqVO.getPyFirstChar()) ; + } + if(StrUtil.isNotBlank(reqVO.getNickname())) { + wrapper.or(Boolean.TRUE).like(AdminUserDO::getNickname, reqVO.getNickname()) ; + } + }) .orderByDesc(AdminUserDO::getId)); }