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)); }