课表同步逻辑调整

src/main/java/com/xjrsoft/module/job/JianyuekbScheduleTask.java

@@ -71,7 +71,7 @@ public class JianyuekbScheduleTask {
             List<BaseClass> classList = classService.list(
                     new QueryWrapper<BaseClass>().lambda()
                             .eq(BaseClass::getGradeId, gradeId)
-                            .eq(orgId != null, BaseClass::getOrgId, orgId)
+                            .eq(BaseClass::getOrgId, orgId)
             );
             List<Long> classIds = classList.stream().map(BaseClass::getId).collect(Collectors.toList());
 

src/test/java/com/xjrsoft/module/job/JianyuekbScheduleTaskTest.java

@@ -65,8 +65,13 @@ class JianyuekbScheduleTaskTest {
         List<Map<String, Object>> jianyueData = SqlRunnerAdapter.db().selectList(sql);
         Map<String, List<Long>> gradeClassMaps = new HashMap<>();//存入对应年级的所有班级id
         for (Map<String, Object> el : jianyueData) {
+            String orgId = el.get("source_id").toString().split("_")[0];
             String gradeId = el.get("source_id").toString().split("_")[1];
-            List<BaseClass> classList = classService.list(new QueryWrapper<BaseClass>().lambda().eq(BaseClass::getGradeId, gradeId));
+            List<BaseClass> classList = classService.list(
+                    new QueryWrapper<BaseClass>().lambda()
+                            .eq(BaseClass::getGradeId, gradeId)
+                            .eq(BaseClass::getOrgId, orgId)
+            );
             List<Long> classIds = classList.stream().map(BaseClass::getId).collect(Collectors.toList());
 
             gradeClassMaps.put(el.get("jianyue_id").toString(), classIds);