| 
														
															@@ -1874,7 +1874,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															 	@Transactional(rollbackFor = Exception.class) 
														 | 
														
														 | 
														
															 	@Transactional(rollbackFor = Exception.class) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     public HttpResponseResult checkCourseSchedules(List<CourseSchedule> courseSchedules, boolean checkExistCourseSchedule,Boolean postponeFlag,ClassGroupStudentMapper classGroupStudentMapper) { 
														 | 
														
														 | 
														
															     public HttpResponseResult checkCourseSchedules(List<CourseSchedule> courseSchedules, boolean checkExistCourseSchedule,Boolean postponeFlag,ClassGroupStudentMapper classGroupStudentMapper) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															- 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		if (CollectionUtils.isEmpty(courseSchedules)) { 
														 | 
														
														 | 
														
															 		if (CollectionUtils.isEmpty(courseSchedules)) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 			return BaseController.failed(); 
														 | 
														
														 | 
														
															 			return BaseController.failed(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		} 
														 | 
														
														 | 
														
															 		} 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -1929,14 +1928,17 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 				.distinct() 
														 | 
														
														 | 
														
															 				.distinct() 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 				.collect(Collectors.toList()); 
														 | 
														
														 | 
														
															 				.collect(Collectors.toList()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		//班级与学生的关联记录 
														 | 
														
														 | 
														
															 		//班级与学生的关联记录 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-		List<ClassGroupStudentMapper> classGroupStudentMappers = classGroupStudentMapperDao.findByClassGroups(classGroupIds); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		Boolean liveFlag = false; 
														 | 
														
														 | 
														
															 		Boolean liveFlag = false; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+		List<ClassGroupStudentMapper> classGroupStudentMappers = new ArrayList<>(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		if(Objects.nonNull(classGroupStudentMapper)){ 
														 | 
														
														 | 
														
															 		if(Objects.nonNull(classGroupStudentMapper)){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 			classGroupStudentMappers.add(classGroupStudentMapper); 
														 | 
														
														 | 
														
															 			classGroupStudentMappers.add(classGroupStudentMapper); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 			if(classGroupStudentMapper.getGroupType() == LIVE){ 
														 | 
														
														 | 
														
															 			if(classGroupStudentMapper.getGroupType() == LIVE){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 				liveFlag = true; 
														 | 
														
														 | 
														
															 				liveFlag = true; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 			} 
														 | 
														
														 | 
														
															 			} 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+		}else { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+			classGroupStudentMappers = classGroupStudentMapperDao.findByClassGroups(classGroupIds); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		} 
														 | 
														
														 | 
														
															 		} 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		Map<Integer, List<ClassGroupStudentMapper>> classGroupStudentsMap = classGroupStudentMappers 
														 | 
														
														 | 
														
															 		Map<Integer, List<ClassGroupStudentMapper>> classGroupStudentsMap = classGroupStudentMappers 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 				.stream() 
														 | 
														
														 | 
														
															 				.stream() 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 				.collect(Collectors.groupingBy(ClassGroupStudentMapper::getClassGroupId)); 
														 | 
														
														 | 
														
															 				.collect(Collectors.groupingBy(ClassGroupStudentMapper::getClassGroupId)); 
														 |