更新检索门墩儿搜索

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/person/PersonInfoMapper.java

@@ -22,6 +22,7 @@ import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
 import com.citu.module.menduner.system.dal.dataobject.workexp.WorkExpDO;
 import com.citu.module.menduner.system.util.JoinHelper;
 import com.citu.module.menduner.system.util.RecruitAnalysisUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.time.LocalDate;
@@ -201,11 +202,15 @@ public interface PersonInfoMapper extends BaseMapperX<PersonInfoDO> {
         query.eqIfPresent(PersonInfoDO::getExpType, reqVO.getExpType());
         query.eqIfPresent(PersonInfoDO::getType, reqVO.getType());
 
-        query.in(CollUtil.isNotEmpty(reqVO.getPositionIds()), JobInterestedDO::getPositionId, reqVO.getPositionIds())
+        query.and(qw->qw.in(CollUtil.isNotEmpty(reqVO.getPositionIds()), JobInterestedDO::getPositionId, reqVO.getPositionIds())
                 .or()
-                .in(CollUtil.isNotEmpty(reqVO.getAreaIds()), JobInterestedDO::getWorkAreaId, reqVO.getAreaIds())
+                .in(CollUtil.isNotEmpty(reqVO.getAreaIds()), JobInterestedDO::getWorkAreaId, reqVO.getAreaIds()))
         ;
-
+        // 2504414 反馈BUG后修改前代码
+//        query.in(CollUtil.isNotEmpty(reqVO.getPositionIds()), JobInterestedDO::getPositionId, reqVO.getPositionIds())
+//                .or()
+//               .in(CollUtil.isNotEmpty(reqVO.getAreaIds()), JobInterestedDO::getWorkAreaId, reqVO.getAreaIds())
+//        ;
         if (CollUtil.isNotEmpty(reqVO.getAreaIds())) {
             StringBuilder jsonContainsClause = new StringBuilder();
             for (Long areaId : reqVO.getAreaIds()) {
@@ -216,15 +221,24 @@ public interface PersonInfoMapper extends BaseMapperX<PersonInfoDO> {
             }
             query.apply("(" + jsonContainsClause.toString() + ")");
         }
+        query.and(StringUtils.isNotEmpty(reqVO.getContent()),
+                        qw->qw.like(PersonInfoDO::getName, reqVO.getContent())
+                                .or()
+                                .like(PersonInfoDO::getTagList, reqVO.getContent())
+                                .or()
+                                .like(PersonInfoDO::getAdvantage, reqVO.getContent())
+                                .or()
+                                .like(PersonInfoDO::getForeignName, reqVO.getContent())
+                );
+//     2504414 反馈BUG后修改前代码
+//     query.likeIfPresent(PersonInfoDO::getName, reqVO.getContent())
+//                .or()
+//                .likeIfExists(PersonInfoDO::getTagList, reqVO.getContent())
+//                .or()
+//                .likeIfExists(PersonInfoDO::getAdvantage, reqVO.getContent())
+//                .or()
+//                .likeIfExists(PersonInfoDO::getForeignName, reqVO.getContent());
 
-        // 或者条件
-        query.likeIfPresent(PersonInfoDO::getName, reqVO.getContent())
-                .or()
-                .likeIfExists(PersonInfoDO::getTagList, reqVO.getContent())
-                .or()
-                .likeIfExists(PersonInfoDO::getAdvantage, reqVO.getContent())
-                .or()
-                .likeIfExists(PersonInfoDO::getForeignName, reqVO.getContent());
 
         query.orderByDesc(PersonInfoDO::getUpdateTime);