Browse Source

Merge branch 'online1'

Joburgess 4 years ago
parent
commit
7490e4ff51

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

@@ -1910,10 +1910,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                         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));