Merge remote-tracking branch 'origin/master'

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

@@ -3784,7 +3784,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             throw new BizException("请填写班级信息");
         }
         for (Integer classGroupId : classGroupIds) {
-            List<CourseSchedule> courseSchedules = courseScheduleService.classGroupNotStartMergeCourseReplace(classGroupId.longValue());
+            List<CourseSchedule> courseSchedules = courseScheduleDao.findCoursesByClassGroupId(classGroupId,CourseStatusEnum.NOT_START);
             if(courseSchedules != null && courseSchedules.size() > 0){
                 throw new BizException("所选班级不能有未开始的临时合并课程");
             }