From d692c7915fd1245c93a314e21f47f3b8916a991a Mon Sep 17 00:00:00 2001
From: chenshaohua <635616957@qq.com>
Date: Wed, 8 Jul 2026 16:29:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9es=E5=BC=80=E5=A7=8B=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=92=8C=E6=88=AA=E8=87=B3=E6=97=B6=E9=97=B4=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/service/impl/ESJobSearchImpl.java      | 18 +++++++++++-------
 .../java/com/ruoyi/common/utils/DateUtils.java |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

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 4c08b70..f4997d1 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,13 +720,17 @@ public class ESJobSearchImpl implements IESJobSearchService
         //开始时间
         Date startDate = jobQuery.getStartDate();
         Date endDate = jobQuery.getEndDate();
-        if (Objects.nonNull(startDate)) {
-            String startStr = DateUtils.UTC_FORMATTER.format(startDate.toInstant());
-            wrapper.ge(ESJobDocument::getPostingDate, startStr);
-        }
-        if (Objects.nonNull(endDate)) {
-            String endStr = DateUtils.UTC_FORMATTER.format(endDate.toInstant());
-            wrapper.le(ESJobDocument::getPostingDate, endStr);
+        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);
+                }
+            });
         }
         // 先开启打分、优先按匹配分数排序（关键词前台命中越高越靠前）
         wrapper.trackScores();
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index df7423d..ee22065 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -37,8 +37,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
 
-    public static final DateTimeFormatter UTC_FORMATTER = DateTimeFormatter
-            .ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+    public static final DateTimeFormatter ES_DATE_FORMATTER = DateTimeFormatter
+            .ofPattern("yyyy-MM-dd HH:mm:ss")
             .withZone(ZoneId.of("UTC"));
 
     /**