update

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

@@ -5385,15 +5385,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     public List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto> getSummaryOfCurrentSemesterCourses(Integer coopId) {
 		//获取合作单位关联的所有乐团列表
 		List<String> musicGroupIds = musicGroupDao.findNormalByCooperationId(coopId);
-		if(CollectionUtils.isEmpty(musicGroupIds)){
-			return Collections.EMPTY_LIST;
-		}
-		//获取当前学期
-		Date date = new Date();
-		String startTerm = DateUtil.getStartTerm(date);
-		String endTerm = DateUtil.getEndTerm(date);
-		List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto> summary =
-				courseScheduleDao.getSummaryOfCurrentSemesterCourses(musicGroupIds, startTerm, endTerm);
 		List<CourseSchedule.CourseScheduleType> courseTypeList = Arrays.asList(
 				CourseScheduleType.SINGLE,
 				CourseScheduleType.MIX,
@@ -5404,13 +5395,25 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				CourseScheduleType.COMPREHENSIVE,
 				CourseScheduleType.CLASSROOM
 		);
+		if(CollectionUtils.isEmpty(musicGroupIds)){
+			return this.initClassOfSummary(courseTypeList,null);
+		}
+		//获取当前学期
+		Date date = new Date();
+		String startTerm = DateUtil.getStartTerm(date);
+		String endTerm = DateUtil.getEndTerm(date);
+		List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto> summary =
+				courseScheduleDao.getSummaryOfCurrentSemesterCourses(musicGroupIds, startTerm, endTerm);
 		return this.initClassOfSummary(courseTypeList,summary);
     }
 
 	private List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto>
 	initClassOfSummary(List<CourseSchedule.CourseScheduleType> courseTypeList,List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto> summary){
 		Map<CourseScheduleType, DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto>
-				map = summary.stream().collect(Collectors.groupingBy(e -> e.getScheduleType(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0))));
+				map = new HashMap<>();
+		if(CollectionUtils.isNotEmpty(summary)){
+			map = summary.stream().collect(Collectors.groupingBy(e -> e.getScheduleType(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0))));
+		}
 		List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto> result = new ArrayList<>();
 		for (CourseScheduleType scheduleType : courseTypeList) {
 			DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto dto = map.get(scheduleType);