From 5090ce18077c3fe6dd63152abf83b32d91121b36 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 14 Oct 2024 17:07:26 +0800 Subject: [PATCH] =?UTF-8?q?bug#393=20=E7=BB=84=E7=BB=87=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E=E5=85=A5=E5=8F=82exactName?= =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E6=8D=AEname=E7=B2=BE=E5=87=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/organ/vo/organ/OrganPageReqVO.java | 4 ++++ .../cf/imes/module/system/dal/mysql/organ/OrganMapper.java | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganPageReqVO.java index b1233cb61..321da4dd5 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganPageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganPageReqVO.java @@ -20,6 +20,10 @@ public class OrganPageReqVO extends PageParam { @Size(max = 30, message = "组织名长度不能超过30个字符") private String name; + @Schema(description = "组织名", example = "晨丰") + @Size(max = 30, message = "组织名长度不能超过30个字符") + private String exactName; + @Schema(description = "联系人", example = "晨丰") @Size(max = 30, message = "联系人长度不能超过30个字符") private String contactName; 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 d8404353a..54adae3a2 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 @@ -30,16 +30,12 @@ public interface OrganMapper extends BaseMapperX { .likeIfPresent(OrganizationDO::getContactName, reqVO.getContactName()) .likeIfPresent(OrganizationDO::getContactMobile, reqVO.getContactMobile()) .eqIfPresent(OrganizationDO::getStatus, reqVO.getStatus()) + .eqIfPresent(OrganizationDO::getName, reqVO.getExactName()) .and(CharSequenceUtil.isNotBlank(reqVO.getName()), wrapper ->{ wrapper.or(Boolean.TRUE).like(OrganizationDO::getName, reqVO.getName()); wrapper.or(CharSequenceUtil.isNotBlank(reqVO.getPyAll())).like(OrganizationDO::getPinyinFull, reqVO.getPyAll()); wrapper.or(CharSequenceUtil.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())*/ .orderByDesc(OrganizationDO::getId)); }