1、课程顺延

2、点名无教学点兼容
3、乐团详情 课表详情null
4、vip课新增指定学员
5、请假审批异常处理

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

@@ -1272,19 +1272,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             if (Objects.nonNull(isSettlement) && isSettlement > 0) {
                 throw new BizException("调整的课程中存在已结算的课程");
             }
-            CourseSchedule oldCourseSchedule = null;
+            List<CourseSchedule> oldCourseSchedules = oldCourseScheduleMap.get(newCourseSchedule.getId());
+            oldCourseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime).reversed());
+            CourseSchedule oldCourseSchedule = oldCourseSchedules.get(0);
             if (Objects.isNull(newCourseSchedule.getActualTeacherId())) {
-                List<CourseSchedule> oldCourseSchedules = oldCourseScheduleMap.get(newCourseSchedule.getId());
-                oldCourseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime).reversed());
-                oldCourseSchedule = oldCourseSchedules.get(0);
                 newCourseSchedule.setActualTeacherId(oldCourseSchedule.getActualTeacherId());
             }
             if (Objects.isNull(newCourseSchedule.getSchoolId())) {
-                if (Objects.isNull(oldCourseSchedule)) {
-                    List<CourseSchedule> oldCourseSchedules = oldCourseScheduleMap.get(newCourseSchedule.getId());
-                    oldCourseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime).reversed());
-                    oldCourseSchedule = oldCourseSchedules.get(0);
-                }
                 newCourseSchedule.setSchoolId(oldCourseSchedule.getSchoolId());
             }
             if (oldCourseSchedule.getType().equals(CourseSchedule.CourseScheduleType.VIP)) {