From c6b2b1c6b2e3171917a28206e115bd649a06f102 Mon Sep 17 00:00:00 2001
From: "hhb@hotmail.com" <hhb@hotmail.com>
Date: Fri, 10 Jan 2025 12:00:55 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=AD=A3=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/service/impl/TeacherServiceImpl.java     | 2 +-
 .../java/cn/teammodel/repository/LessonRecordRepository.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java
index 71789f5..8390598 100644
--- a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java
+++ b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java
@@ -43,7 +43,7 @@ import static cn.teammodel.utils.SchoolDateUtil.calculateWeekNum;
 public class TeacherServiceImpl implements TeacherService {
     @Resource
     private SchoolTeacherRepository schoolTeacherRepository;
-        @Resource
+    @Resource
     private SchoolGroupListRepository schoolGroupListRepository;
     @Resource
     private SchoolRepository  schoolRepository;
diff --git a/src/main/java/cn/teammodel/repository/LessonRecordRepository.java b/src/main/java/cn/teammodel/repository/LessonRecordRepository.java
index 30e2e6a..b4bef45 100644
--- a/src/main/java/cn/teammodel/repository/LessonRecordRepository.java
+++ b/src/main/java/cn/teammodel/repository/LessonRecordRepository.java
@@ -18,8 +18,8 @@ public interface LessonRecordRepository extends CosmosRepository<LessonRecord, S
             "(IS_NULL(@endTime) or c.startTime <= @endTime) and "+
             "(IS_NULL(@grade) or array_contains(c.grade,@grade)) and " +
             "c.status<>404 and "+
-            "c.periodId = @periodId and "+
-            "(IS_NULL(@subjectId) or c.subjectId = @subjectId) and"+
+            "(IS_NULL(@periodId) or c.periodId = @periodId) and "+
+            "(IS_NULL(@subjectId) or c.subjectId = @subjectId) and "+
             "(IS_NULL(@tmdId) or c.tmdid = @tmdId) ")
     List<LessonRecord> getLessonsByConditions(String code, Long startTime, Long endTime,String subjectId,String tmdId,String grade,String periodId);