周箭河 преди 5 години
родител
ревизия
b0f5ef7eef
променени са 1 файла, в които са добавени 5 реда и са изтрити 1 реда
  1. 5 1
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

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

@@ -624,7 +624,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				boolean isTeacherRepeat = false;
 				boolean isStudentRepeat = false;
 				//检测老师冲突
-				existCourseSchedule.setTeachingTeacherIdList(courseScheduleTeacherMap.get(existCourseSchedule.getId().intValue()).getIds());
+				if(courseScheduleTeacherMap.containsKey(existCourseSchedule.getId().intValue())){
+					existCourseSchedule.setTeachingTeacherIdList(courseScheduleTeacherMap.get(existCourseSchedule.getId().intValue()).getIds());
+				}else {
+					existCourseSchedule.setTeachingTeacherIdList(classGroupTeachingTeacherMap.get(existCourseSchedule.getClassGroupId()).getIds());
+				}
 				newCourseSchedule.setTeachingTeacherIdList(classGroupTeachingTeacherMap.get(newCourseSchedule.getClassGroupId()).getIds());
 
 				if(!CollectionUtils.isEmpty(newCourseSchedule.getTeachingTeacherIdList())