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 ca8d517..2f6a45f 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 @@ -675,12 +675,13 @@ public class ESJobSearchImpl implements IESJobSearchService List integers = StringUtil.convertStringToIntegerList(jobQuery.getExperience()); wrapper.and(a->a.in(ESJobDocument::getExperience,integers)); } - // 薪资范围:岗位最高薪资必须在用户筛选范围内 + Long userMinSalary = Objects.nonNull(jobQuery.getSalaryMin()) ? jobQuery.getSalaryMin() : jobQuery.getMinSalary(); + Long userMaxSalary = Objects.nonNull(jobQuery.getSalaryMax()) ? jobQuery.getSalaryMax() : jobQuery.getMaxSalary(); if (Objects.nonNull(jobQuery.getMinSalary())) { - wrapper.filter(x -> x.ge(ESJobDocument::getMaxSalary, jobQuery.getMinSalary())); + wrapper.filter(x -> x.ge(ESJobDocument::getMaxSalary, userMinSalary)); } if (Objects.nonNull(jobQuery.getMaxSalary())) { - wrapper.filter(x -> x.le(ESJobDocument::getMinSalary, jobQuery.getMaxSalary())); + wrapper.filter(x -> x.le(ESJobDocument::getMinSalary, userMaxSalary)); } if(hasText(jobQuery.getScaleDictCode())){ wrapper.and(a->a.eq(ESJobDocument::getScaleDictCode,jobQuery.getScaleDictCode().trim()));