Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into online-2020-11-23

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

@@ -1894,20 +1894,20 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                                 backCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
                             }
                         }
-                        if(CollectionUtils.isEmpty(preCourseSchedule.getTeachingTeacherIdList())){
-							preCourseSchedule.setTeachingTeacherIdList(new ArrayList<>(Arrays.asList(preCourseSchedule.getActualTeacherId())));
-						}else{
-							preCourseSchedule.getTeachingTeacherIdList().add(preCourseSchedule.getActualTeacherId());
+                        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())){
-							backCourseSchedule.setTeachingTeacherIdList(new ArrayList<>(Arrays.asList(backCourseSchedule.getActualTeacherId())));
-						}else{
-							backCourseSchedule.getTeachingTeacherIdList().add(backCourseSchedule.getActualTeacherId());
+                        if(!CollectionUtils.isEmpty(backCourseSchedule.getTeachingTeacherIdList())){
+							backTeachingTeacherIdList.addAll(backCourseSchedule.getTeachingTeacherIdList());
 						}
-                        if (!CollectionUtils.isEmpty(preCourseSchedule.getTeachingTeacherIdList())
-                                && !CollectionUtils.isEmpty(backCourseSchedule.getTeachingTeacherIdList())) {
-                            List<Integer> repeatIds = preCourseSchedule.getTeachingTeacherIdList()
-                                    .stream().filter(backCourseSchedule.getTeachingTeacherIdList()::contains)
+                        if (!CollectionUtils.isEmpty(preTeachingTeacherIdList)
+                                && !CollectionUtils.isEmpty(backTeachingTeacherIdList)) {
+                            List<Integer> repeatIds = preTeachingTeacherIdList
+                                    .stream().filter(backTeachingTeacherIdList::contains)
                                     .collect(Collectors.toList());
                             if (!CollectionUtils.isEmpty(repeatIds)) {
                                 throw new BizException(courseCheckInfo(preCourseSchedule, backCourseSchedule, existCourseScheduleIds, 2));