|
@@ -2097,14 +2097,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
boolean isTeacherRepeat = false;
|
|
|
boolean isStudentRepeat = false;
|
|
|
//检测老师冲突
|
|
|
- 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 (courseScheduleTeacherMap.containsKey(existCourseSchedule.getId())) {
|
|
|
+ existCourseSchedule.setTeachingTeacherIdList(courseScheduleTeacherMap.get(existCourseSchedule.getId()).getIds());
|
|
|
+ } else {
|
|
|
+ existCourseSchedule.setTeachingTeacherIdList(classGroupTeachingTeacherMap.get(existCourseSchedule.getClassGroupId().longValue()).getIds());
|
|
|
+ }
|
|
|
+ newCourseSchedule.setTeachingTeacherIdList(classGroupTeachingTeacherMap.get(newCourseSchedule.getClassGroupId().longValue()).getIds());
|
|
|
|
|
|
- if (!CollectionUtils.isEmpty(newCourseSchedule.getTeachingTeacherIdList())
|
|
|
+ if (!CollectionUtils.isEmpty(newCourseSchedule.getTeachingTeacherIdList())
|
|
|
&& !CollectionUtils.isEmpty(existCourseSchedule.getTeachingTeacherIdList())) {
|
|
|
List<Integer> repeatIds = newCourseSchedule.getTeachingTeacherIdList()
|
|
|
.stream().filter(existCourseSchedule.getTeachingTeacherIdList()::contains)
|