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 f4997d1..5b31815 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 @@ -720,17 +720,13 @@ public class ESJobSearchImpl implements IESJobSearchService //开始时间 Date startDate = jobQuery.getStartDate(); Date endDate = jobQuery.getEndDate(); - if (Objects.nonNull(startDate) || Objects.nonNull(endDate)) { - wrapper.and(w -> { - if (Objects.nonNull(startDate)) { - String startStr = DateUtils.ES_DATE_FORMATTER.format(startDate.toInstant()); - w.ge(ESJobDocument::getPostingDate, startStr); - } - if (Objects.nonNull(endDate)) { - String endStr = DateUtils.ES_DATE_FORMATTER.format(endDate.toInstant()); - w.le(ESJobDocument::getPostingDate, endStr); - } - }); + if (Objects.nonNull(startDate) && Objects.nonNull(endDate)) { + wrapper.and(w -> w.ge(ESJobDocument::getPostingDate, DateUtils.ES_DATE_FORMATTER.format(startDate.toInstant())) + .le(ESJobDocument::getPostingDate, DateUtils.ES_DATE_FORMATTER.format(endDate.toInstant()))); + } else if (Objects.nonNull(startDate)) { + wrapper.ge(ESJobDocument::getPostingDate, DateUtils.ES_DATE_FORMATTER.format(startDate.toInstant())); + } else if (Objects.nonNull(endDate)) { + wrapper.le(ESJobDocument::getPostingDate, DateUtils.ES_DATE_FORMATTER.format(endDate.toInstant())); } // 先开启打分、优先按匹配分数排序(关键词前台命中越高越靠前) wrapper.trackScores();