From 5a96ab08a9836ada4262a88134ded29915417902 Mon Sep 17 00:00:00 2001 From: yangsb Date: Tue, 30 Apr 2024 16:27:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=84=E7=BB=87=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=8E=A5=E5=8F=A3=20sql=20or=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 --- .../imes/module/system/dal/mysql/organ/OrganMapper.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java index 43c1acb19..b6d2ec10c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java @@ -24,11 +24,16 @@ public interface OrganMapper extends BaseMapperX { .likeIfPresent(OrganizationDO::getContactMobile, reqVO.getContactMobile()) .eqIfPresent(OrganizationDO::getStatus, reqVO.getStatus()) .betweenIfPresent(OrganizationDO::getCreateTime, reqVO.getCreateTime()) - .likeIfPresent(OrganizationDO::getName, reqVO.getName()) + .and(StrUtil.isNotBlank(reqVO.getName()), wrapper ->{ + wrapper.or(Boolean.TRUE).like(OrganizationDO::getName, reqVO.getName()); + wrapper.or(StrUtil.isNotBlank(reqVO.getPyAll())).like(OrganizationDO::getPinyinFull, reqVO.getPyAll()); + wrapper.or(StrUtil.isNotBlank(reqVO.getPyFirstChar())).like(OrganizationDO::getPinyinInitial, reqVO.getPyFirstChar()); + }) + /*.likeIfPresent(OrganizationDO::getName, reqVO.getName()) .or(StrUtil.isNotBlank(reqVO.getName())) .likeIfPresent(OrganizationDO::getPinyinFull, reqVO.getPyAll()) .or(StrUtil.isNotBlank(reqVO.getName())) - .likeIfPresent(OrganizationDO::getPinyinInitial, reqVO.getPyFirstChar()) + .likeIfPresent(OrganizationDO::getPinyinInitial, reqVO.getPyFirstChar())*/ .orderByDesc(OrganizationDO::getId)); }