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