From d54937c4161804ff4423fc6ec7d86ac8bf3a6277 Mon Sep 17 00:00:00 2001 From: miaowenbo <1670593359@qq.com> Date: Fri, 28 Nov 2025 16:43:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=BE=E7=A8=8B=E5=AD=A6=E4=B9=A0=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E5=8F=82?= =?UTF-8?q?=E6=95=B0=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 3422c9a9..04fd89de 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 @@ -147,7 +147,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 <= 查询结束时间) // 这样兼容查询结束时间为空值的情况，因为学员课程未结束时没有结束时间 @@ -164,13 +164,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));