Merge branch 'master' into origin_master

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -3564,6 +3564,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             //上低音号、长号 合并计算
             if (regEntry.getKey().equals(14) || regEntry.getKey().equals(15)) {
                 otherSubjectRegNum += regEntry.getValue().size();
+                continue;
             }
             int classNum = regEntry.getValue().size() / 6;
             classNum += (regEntry.getValue().size() % 6) > 0 ? 1 : 0;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -3953,11 +3953,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             }
         }
 
-        if (updateList.size() > 0) {
+		Set<Long> courseIds = null;
+		if (updateList.size() > 0) {
             courseScheduleDao.batchUpdate(updateList);
+			courseIds = updateList.stream().map(CourseSchedule::getId).collect(Collectors.toSet());
         }
 
-		courseEventSource.courseStatusChange(null);
+		courseEventSource.courseStatusChange(courseIds);
 
         // 更新班级已上课次
         if (classGroupIds.size() > 0) {
@@ -4017,8 +4019,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
         if (updateList.size() > 0) {
             courseScheduleDao.batchUpdate(updateList);
-			Set<Long> courseIds = updateList.stream().map(CourseSchedule::getId).collect(Collectors.toSet());
-			courseEventSource.courseStatusChange(courseIds);
 		}
 		return true;
 	}