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 8684aff..4171a9e 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 @@ -531,14 +531,14 @@ public class ESJobSearchImpl implements IESJobSearchService // 岗位薪资范围与用户期望薪资范围有交集 // 条件:岗位最小薪资 <= 用户最大薪资 AND 岗位最大薪资 >= 用户最小薪资 if(Objects.nonNull(userMinSalary) && Objects.nonNull(userMaxSalary)){ - wrapper.and(x->x.le(ESJobDocument::getMaxSalary,userMaxSalary) - .ge(ESJobDocument::getMinSalary,userMinSalary)); + wrapper.and(x->x.le(ESJobDocument::getMinSalary,userMaxSalary) + .ge(ESJobDocument::getMaxSalary,userMinSalary)); } else if(Objects.nonNull(userMinSalary)){ // 只有最小薪资:岗位最大薪资 >= 用户最小薪资 - wrapper.and(x->x.ge(ESJobDocument::getMinSalary,userMinSalary)); + wrapper.and(x->x.ge(ESJobDocument::getMaxSalary,userMinSalary)); } else if(Objects.nonNull(userMaxSalary)){ // 只有最大薪资:岗位最小薪资 <= 用户最大薪资 - wrapper.and(x->x.le(ESJobDocument::getMaxSalary,userMaxSalary)); + wrapper.and(x->x.le(ESJobDocument::getMinSalary,userMaxSalary)); } if(!StringUtil.isEmptyOrNull(esJobSearch.getExperience())){ Integer maxValue = StringUtil.findMaxValue(esJobSearch.getExperience());