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 9c8f49f..b5d7435 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 @@ -491,11 +491,13 @@ public class ESJobSearchImpl implements IESJobSearchService Integer maxValue = StringUtil.findMaxValue(esJobSearch.getEducation()); wrapper.and(x->x.eq(ESJobDocument::getEducation_int,maxValue)); } - if(Objects.nonNull(esJobSearch.getMaxSalary())){ - wrapper.and(x->x.le(ESJobDocument::getMaxSalary,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(Objects.nonNull(esJobSearch.getMaxSalary())){ + wrapper.and(x->x.le(ESJobDocument::getMinSalary,esJobSearch.getMaxSalary())); } if(!StringUtil.isEmptyOrNull(esJobSearch.getExperience())){ Integer maxValue = StringUtil.findMaxValue(esJobSearch.getExperience());