diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java index 14626c3..0e977a4 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java @@ -493,7 +493,7 @@ public class ESJobSearchImpl implements IESJobSearchService LambdaEsQueryWrapper wrapper = new LambdaEsQueryWrapper<>(); if(!StringUtil.isEmptyOrNull(esJobSearch.getJobTitle())){ for (String keyWord:esJobSearch.getJobTitle().split(",")) { - wrapper.and(a -> a.match(ESJobDocument::getJobTitle, keyWord, 5.0f) + wrapper.or(a -> a.match(ESJobDocument::getJobTitle, keyWord, 5.0f) ); } @@ -509,10 +509,10 @@ public class ESJobSearchImpl implements IESJobSearchService wrapper.and(x->x.in(ESJobDocument::getEducation,integers)); } if(Objects.nonNull(esJobSearch.getMaxSalary())){ - wrapper.and(x->x.le(ESJobDocument::getMaxSalary,esJobSearch.getMaxSalary())); + wrapper.and(x->x.le(ESJobDocument::getMinSalary,esJobSearch.getMaxSalary())); } if(Objects.nonNull(esJobSearch.getMinSalary())){ - wrapper.and(x->x.ge(ESJobDocument::getMinSalary,esJobSearch.getMinSalary())); + wrapper.and(x->x.ge(ESJobDocument::getMaxSalary,esJobSearch.getMinSalary())); } if(!StringUtil.isEmptyOrNull(esJobSearch.getExperience())){ //Integer maxValue = StringUtil.findMaxValue(esJobSearch.getExperience());