|
@@ -87,6 +87,9 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ if(StringUtils.isNoneBlank(exercisesSituationDto.getEducationalTeacherName())){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
List<StudentEduTeacherDto> t2 = studentEduTeachers.stream().filter(set -> set.getGroupType().equals(GroupType.MUSIC.getCode())).collect(Collectors.toList());
|
|
|
if(CollectionUtils.isEmpty(t2)){
|
|
|
for (StudentEduTeacherDto studentEduTeacherDto : t2) {
|