Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -1929,7 +1929,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                         }
                         //助教冲突检测
                         if (Objects.isNull(preCourseSchedule.getId())) {
-                            IntegerAndIntegerListDto integerAndIntegerListDto = classGroupTeachingTeacherMap.get(preCourseSchedule.getClassGroupId());
+                            IntegerAndIntegerListDto integerAndIntegerListDto = classGroupTeachingTeacherMap.get(preCourseSchedule.getClassGroupId().longValue());
                             if (Objects.nonNull(integerAndIntegerListDto)) {
                                 preCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
                             }
@@ -1940,7 +1940,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                             }
                         }
                         if (Objects.isNull(backCourseSchedule.getId())) {
-                            IntegerAndIntegerListDto integerAndIntegerListDto = classGroupTeachingTeacherMap.get(backCourseSchedule.getClassGroupId());
+                            IntegerAndIntegerListDto integerAndIntegerListDto = classGroupTeachingTeacherMap.get(backCourseSchedule.getClassGroupId().longValue());
                             if (Objects.nonNull(integerAndIntegerListDto)) {
                                 backCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
                             }
@@ -2097,12 +2097,12 @@ 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());
+                if (courseScheduleTeacherMap.containsKey(existCourseSchedule.getId())) {
+                    existCourseSchedule.setTeachingTeacherIdList(courseScheduleTeacherMap.get(existCourseSchedule.getId()).getIds());
                 } else {
-                    existCourseSchedule.setTeachingTeacherIdList(classGroupTeachingTeacherMap.get(existCourseSchedule.getClassGroupId()).getIds());
+                    existCourseSchedule.setTeachingTeacherIdList(classGroupTeachingTeacherMap.get(existCourseSchedule.getClassGroupId().longValue()).getIds());
                 }
-                newCourseSchedule.setTeachingTeacherIdList(classGroupTeachingTeacherMap.get(newCourseSchedule.getClassGroupId()).getIds());
+                newCourseSchedule.setTeachingTeacherIdList(classGroupTeachingTeacherMap.get(newCourseSchedule.getClassGroupId().longValue()).getIds());
 
                 if (!CollectionUtils.isEmpty(newCourseSchedule.getTeachingTeacherIdList())
                         && !CollectionUtils.isEmpty(existCourseSchedule.getTeachingTeacherIdList())) {