From 2b7d0ef35a9ae88bebb9539e624e4443bd400b23 Mon Sep 17 00:00:00 2001 From: miaowenbo <1670593359@qq.com> Date: Tue, 2 Dec 2025 17:41:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=AD=A6=E4=B9=A0=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3=E8=A1=A5=E5=85=A8=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=E7=9A=84=E7=A9=BA=E5=80=BC=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/study/service/impl/StudyCourseServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java index cba83a6e..0f4b94d5 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java @@ -819,7 +819,7 @@ public class StudyCourseServiceImpl implements IStudyCourseService{ query.addFilter(FieldFilters.eq("aid", sc.getAid())); } // 25.11.25新增：添加基于时间的查询条件 - if (sc.getQueryStartTime() != null && sc.getQueryFinishTime() != null) { + if (StringUtils.isNotBlank(sc.getQueryStartTime()) && StringUtils.isNotBlank(sc.getQueryFinishTime())) { // 开始结束时间均传入的情况，实现筛选逻辑 // (startTime >= 查询开始时间 AND startTime <= 查询结束时间) OR (finishTime >= 查询开始时间 AND finishTime <= 查询结束时间) // 这样兼容查询结束时间为空值的情况，因为学员课程未结束时没有结束时间 @@ -836,13 +836,13 @@ public class StudyCourseServiceImpl implements IStudyCourseService{ } else { // 只输出单个参数情况 // 筛选开始时间 - if (sc.getQueryStartTime() != null) { + if (StringUtils.isNotBlank(sc.getQueryStartTime())) { LocalDate startDate = LocalDate.parse(sc.getQueryStartTime()); LocalDateTime startDateTime = startDate.atStartOfDay(); query.addFilter(FieldFilters.ge("startTime", startDateTime)); } // 筛选结束时间 - if (sc.getQueryFinishTime() != null) { + if (StringUtils.isNotBlank(sc.getQueryFinishTime())) { LocalDate finishDate = LocalDate.parse(sc.getQueryFinishTime()); LocalDateTime finishDateTime = finishDate.atTime(LocalTime.MAX); query.addFilter(FieldFilters.le("finishTime", finishDateTime));