update

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

@@ -1877,41 +1877,37 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 //                        }
 
                         //助教冲突检测
+						List<Integer> preTeachingTeacherIdList = new ArrayList<>();
+						List<Integer> backTeachingTeacherIdList = new ArrayList<>();
 						if (allCourseScheduleIds.contains(preCourseSchedule.getId())) {
 							IntegerAndIntegerListDto integerAndIntegerListDto = courseScheduleTeachingTeacherMap.get(preCourseSchedule.getId());
 							if (Objects.nonNull(integerAndIntegerListDto)) {
-								preCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
+								preTeachingTeacherIdList.addAll(integerAndIntegerListDto.getIds());
 							}
 						}
-                        if (CollectionUtils.isEmpty(preCourseSchedule.getTeachingTeacherIdList())) {
+                        if (CollectionUtils.isEmpty(preTeachingTeacherIdList)) {
                             IntegerAndIntegerListDto integerAndIntegerListDto = classGroupTeachingTeacherMap.get(preCourseSchedule.getClassGroupId().longValue());
                             if (Objects.nonNull(integerAndIntegerListDto)) {
-                                preCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
+								preTeachingTeacherIdList.addAll(integerAndIntegerListDto.getIds());
                             }
                         }
 
 						if (allCourseScheduleIds.contains(backCourseSchedule.getId())) {
 							IntegerAndIntegerListDto integerAndIntegerListDto = courseScheduleTeachingTeacherMap.get(backCourseSchedule.getId());
 							if (Objects.nonNull(integerAndIntegerListDto)) {
-								backCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
+								backTeachingTeacherIdList.addAll(integerAndIntegerListDto.getIds());
 							}
 						}
-                        if (CollectionUtils.isEmpty(backCourseSchedule.getTeachingTeacherIdList())) {
+                        if (CollectionUtils.isEmpty(backTeachingTeacherIdList)) {
                             IntegerAndIntegerListDto integerAndIntegerListDto = classGroupTeachingTeacherMap.get(backCourseSchedule.getClassGroupId().longValue());
                             if (Objects.nonNull(integerAndIntegerListDto)) {
-                                backCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
+								backTeachingTeacherIdList.addAll(integerAndIntegerListDto.getIds());
                             }
                         }
-                        List<Integer> preTeachingTeacherIdList = new ArrayList<>();
+
 						preTeachingTeacherIdList.add(preCourseSchedule.getActualTeacherId());
-                        List<Integer> backTeachingTeacherIdList = new ArrayList<>();
 						backTeachingTeacherIdList.add(backCourseSchedule.getActualTeacherId());
-                        if(!CollectionUtils.isEmpty(preCourseSchedule.getTeachingTeacherIdList())){
-							preTeachingTeacherIdList.addAll(preCourseSchedule.getTeachingTeacherIdList());
-						}
-                        if(!CollectionUtils.isEmpty(backCourseSchedule.getTeachingTeacherIdList())){
-							backTeachingTeacherIdList.addAll(backCourseSchedule.getTeachingTeacherIdList());
-						}
+
                         if (!CollectionUtils.isEmpty(preTeachingTeacherIdList)
                                 && !CollectionUtils.isEmpty(backTeachingTeacherIdList)) {
                             List<Integer> repeatIds = preTeachingTeacherIdList