From c030a0d58a56f3eed96adad318594788733deff5 Mon Sep 17 00:00:00 2001 From: "hhb@hotmail.com" Date: Tue, 21 Jan 2025 16:14:58 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=8F=AD=E7=BA=A7=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/CommonServiceImpl.java | 3 ++- src/main/java/cn/teammodel/repository/ClassRepository.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/CommonServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/CommonServiceImpl.java index 0047455..77c914f 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/CommonServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/CommonServiceImpl.java @@ -1,5 +1,6 @@ package cn.teammodel.controller.admin.service.impl; +import cn.teammodel.common.PK; import cn.teammodel.controller.admin.service.CommonService; import cn.teammodel.model.dto.admin.common.CommentDto; import cn.teammodel.model.dto.admin.common.GCDto; @@ -39,7 +40,7 @@ public class CommonServiceImpl implements CommonService { try { //获取当前学校该学段下详细信息 List period = schoolRepository.findPeriodById(gcDto.getSchoolId(), gcDto.getPeriodId()); - List classes = classRepository.findClassBySchoolIdAndPeriodId(gcDto.getPeriodId()); + List classes = classRepository.findClassBySchoolIdAndPeriodId(gcDto.getPeriodId(), String.format(PK.CLASS, gcDto.getSchoolId())); int year; int mon; int day; diff --git a/src/main/java/cn/teammodel/repository/ClassRepository.java b/src/main/java/cn/teammodel/repository/ClassRepository.java index bb03d4d..168bc3b 100644 --- a/src/main/java/cn/teammodel/repository/ClassRepository.java +++ b/src/main/java/cn/teammodel/repository/ClassRepository.java @@ -18,6 +18,6 @@ public interface ClassRepository extends CosmosRepository { @Query("select c.id, c.name from School as c where c.code = @code and c.id in (@ids)") List findAllByCodeAndIdIn(String code, Collection ids); - @Query("select c.id, c.name,c.year,c.periodId from School as c where c.periodId = @periodId and c.pk = 'Class'") - List findClassBySchoolIdAndPeriodId(String periodId); + @Query("select c.id, c.name,c.year,c.periodId from School as c where c.periodId = @periodId and c.pk = 'Class' and c.code = @code") + List findClassBySchoolIdAndPeriodId(String periodId,String code); }