Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -6394,7 +6394,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		String liveRoomId = getCourseScheduleLiveRoomId(courseSchedule, continueCourseTime, newCourseSchedules, courseScheduleTimes);
 
 		// 定时任务更新课程状态为进行中，判断当前课程状态是否匹配
-		int studentRemindTime = Integer.parseInt(sysConfigService.findByParamName(SysConfigService.LIVE_CLASS_START_REMIND_TIME).getParanValue());
+		/*int studentRemindTime = Integer.parseInt(sysConfigService.findByParamName(SysConfigService.LIVE_CLASS_START_REMIND_TIME).getParanValue());
 
 		Date date = DateUtil.startDateAndEndTime(courseSchedule.getClassDate(), courseSchedule.getStartClassTime());
 		date = DateUtil.addMinutes(date, -studentRemindTime);
@@ -6402,7 +6402,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(CourseStatusEnum.NOT_START.equals(courseSchedule.getStatus()) && date.after(new Date())) {
 			throw new BizException("直播课暂未开启，请稍后重试");
 		}
-		/*if (CourseStatusEnum.OVER == courseSchedule.getStatus()) {
+		if (CourseStatusEnum.OVER == courseSchedule.getStatus()) {
 			throw new BizException("直播课已结束");
 		}*/
 

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

@@ -169,6 +169,7 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
             // 学生ID集合
             Set<Integer> userIdList = studentLessonTrainingDetailList.stream()
                     .map(StudentLessonTrainingDetail::getUserId)
+                    .filter(Objects::nonNull)
                     .map(Long::intValue)
                     .collect(Collectors.toSet());
             // 设置声部

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

@@ -75,6 +75,7 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
         // 学生ID集合
         Set<Integer> userIdList = studentLessonExaminations.stream()
                 .map(StudentLessonExamination::getUserId)
+                .filter(Objects::nonNull)
                 .collect(Collectors.toSet());
         // 设置声部
         Map<Integer, StudentSubjectDto> subjectDtoMap = studentLessonTrainingDetailService

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

@@ -232,6 +232,7 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
         // 用户ID集合
         List<Integer> userIdList = list.stream()
                                     .map(StudentLessonTrainingDetail::getUserId)
+                                    .filter(Objects::nonNull)
                                     .distinct()
                                     .map(Long::intValue)
                                     .collect(Collectors.toList());

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

@@ -509,6 +509,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
                         // 学生ID集合
                         Set<Integer> userIdList = studentLessonTrainingDetails.stream()
                                                                               .map(StudentLessonTrainingDetail::getUserId)
+                                                                                .filter(Objects::nonNull)
                                                                                 .map(Long::intValue)
                                                                               .collect(Collectors.toSet());
                         // 设置声部