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 CosmosRepository404 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 getLessonsByConditions(String code, Long startTime, Long endTime,String subjectId,String tmdId,String grade,String periodId);