|  | @@ -624,7 +624,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 | 
	
		
			
				|  |  |  				boolean isTeacherRepeat = false;
 | 
	
		
			
				|  |  |  				boolean isStudentRepeat = false;
 | 
	
		
			
				|  |  |  				//检测老师冲突
 | 
	
		
			
				|  |  | -				existCourseSchedule.setTeachingTeacherIdList(courseScheduleTeacherMap.get(existCourseSchedule.getId().intValue()).getIds());
 | 
	
		
			
				|  |  | +				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(!CollectionUtils.isEmpty(newCourseSchedule.getTeachingTeacherIdList())
 |