|
@@ -363,7 +363,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
|
|
|
}
|
|
|
List<Integer> subjectIds = new ArrayList<>();
|
|
|
for (CourseSchedule courseSchedule : courseSchedules) {
|
|
|
- if(idClassGroupMap.containsKey(courseSchedule.getClassGroupId())){
|
|
|
+ if(idClassGroupMap.containsKey(courseSchedule.getClassGroupId())&&StringUtils.isNotBlank(idClassGroupMap.get(courseSchedule.getClassGroupId()).getSubjectIdList())){
|
|
|
List<Integer> ids = Arrays.stream(idClassGroupMap.get(courseSchedule.getClassGroupId()).getSubjectIdList().split(",")).map(id -> Integer.valueOf(id)).collect(Collectors.toList());
|
|
|
subjectIds.addAll(ids);
|
|
|
}
|