|
@@ -84,7 +84,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
|
|
|
// exercisesSituationDto.setExpectExercisesNum((int) until+1);
|
|
|
List<UserGroupDto> userGroupDtos = userGroupsMap.get(exercisesSituationDto.getStudentId());
|
|
|
if(!CollectionUtils.isEmpty(userGroupDtos)){
|
|
|
- exercisesSituationDto.setGroupNames(userGroupDtos.stream().map(UserGroupDto::getGroupName).sorted().collect(Collectors.joining(",")));
|
|
|
+ exercisesSituationDto.setGroupNames(userGroupDtos.stream().filter(ug->StringUtils.isNotBlank(ug.getGroupName())).map(UserGroupDto::getGroupName).sorted().collect(Collectors.joining(",")));
|
|
|
}
|
|
|
List<StudentEduTeacherDto> studentEduTeachers = studentEduTeachersMap.get(exercisesSituationDto.getStudentId());
|
|
|
if(!CollectionUtils.isEmpty(studentEduTeachers)){
|