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<School.Period> period = schoolRepository.findPeriodById(gcDto.getSchoolId(), gcDto.getPeriodId());
-            List<ClassInfo> classes = classRepository.findClassBySchoolIdAndPeriodId(gcDto.getPeriodId());
+            List<ClassInfo> 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<ClassInfo, String> {
 
     @Query("select c.id, c.name from School as c where c.code = @code and c.id in (@ids)")
     List<ClassInfo> findAllByCodeAndIdIn(String code, Collection<String> ids);
-    @Query("select c.id, c.name,c.year,c.periodId from School as c where c.periodId = @periodId and c.pk = 'Class'")
-    List<ClassInfo> 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<ClassInfo> findClassBySchoolIdAndPeriodId(String periodId,String code);
 }