Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 21:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug#393 组织分页查询新增入参exactName，根据name精准查询

Browse Source
This commit is contained in:
gaoqr
2024-10-14 17:07:26 +08:00
parent b2f0e05564
commit 5090ce1807
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganPageReqVO.java
+4
View File
@@ -20,6 +20,10 @@ public class OrganPageReqVO extends PageParam {
@Size(max = 30, message = "组织名长度不能超过30个字符") @Size(max = 30, message = "组织名长度不能超过30个字符")
private String name; private String name;
@Schema(description = "组织名", example = "晨丰")
@Size(max = 30, message = "组织名长度不能超过30个字符")
private String exactName;
@Schema(description = "联系人", example = "晨丰") @Schema(description = "联系人", example = "晨丰")
@Size(max = 30, message = "联系人长度不能超过30个字符") @Size(max = 30, message = "联系人长度不能超过30个字符")
private String contactName; private String contactName;
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java
+1 -5
View File
@@ -30,16 +30,12 @@ public interface OrganMapper extends BaseMapperX<OrganizationDO> {
.likeIfPresent(OrganizationDO::getContactName, reqVO.getContactName()) .likeIfPresent(OrganizationDO::getContactName, reqVO.getContactName())
.likeIfPresent(OrganizationDO::getContactMobile, reqVO.getContactMobile()) .likeIfPresent(OrganizationDO::getContactMobile, reqVO.getContactMobile())
.eqIfPresent(OrganizationDO::getStatus, reqVO.getStatus()) .eqIfPresent(OrganizationDO::getStatus, reqVO.getStatus())
.eqIfPresent(OrganizationDO::getName, reqVO.getExactName())
.and(CharSequenceUtil.isNotBlank(reqVO.getName()), wrapper ->{ .and(CharSequenceUtil.isNotBlank(reqVO.getName()), wrapper ->{
wrapper.or(Boolean.TRUE).like(OrganizationDO::getName, reqVO.getName()); 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.getPyAll())).like(OrganizationDO::getPinyinFull, reqVO.getPyAll());
wrapper.or(CharSequenceUtil.isNotBlank(reqVO.getPyFirstChar())).like(OrganizationDO::getPinyinInitial, reqVO.getPyFirstChar()); 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)); .orderByDesc(OrganizationDO::getId));
} }