Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -80,9 +80,9 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 					List<StudentEduTeacherDto> t1 = studentEduTeachers.stream().filter(set -> set.getGroupType().equals(GroupType.VIP.getCode())||set.getGroupType().equals(GroupType.PRACTICE.getCode())).collect(Collectors.toList());
 					if(!CollectionUtils.isEmpty(t1)){
 						for (StudentEduTeacherDto studentEduTeacherDto : t1) {
-							if(StringUtils.isNoneBlank(studentEduTeacherDto.getEducationalTeacherName())){
-								exercisesSituationDto.setEducationalTeacherId(studentEduTeachers.get(0).getEducationalTeacherId());
-								exercisesSituationDto.setEducationalTeacherName(studentEduTeachers.get(0).getEducationalTeacherName());
+							if(StringUtils.isNotBlank(studentEduTeacherDto.getEducationalTeacherName())){
+								exercisesSituationDto.setEducationalTeacherId(studentEduTeacherDto.getEducationalTeacherId());
+								exercisesSituationDto.setEducationalTeacherName(studentEduTeacherDto.getEducationalTeacherName());
 								break;
 							}
 						}
@@ -93,9 +93,9 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 					List<StudentEduTeacherDto> t2 = studentEduTeachers.stream().filter(set -> set.getGroupType().equals(GroupType.MUSIC.getCode())).collect(Collectors.toList());
 					if(!CollectionUtils.isEmpty(t2)){
 						for (StudentEduTeacherDto studentEduTeacherDto : t2) {
-							if(StringUtils.isNoneBlank(studentEduTeacherDto.getEducationalTeacherName())){
-								exercisesSituationDto.setEducationalTeacherId(studentEduTeachers.get(0).getEducationalTeacherId());
-								exercisesSituationDto.setEducationalTeacherName(studentEduTeachers.get(0).getEducationalTeacherName());
+							if(StringUtils.isNotBlank(studentEduTeacherDto.getEducationalTeacherName())){
+								exercisesSituationDto.setEducationalTeacherId(studentEduTeacherDto.getEducationalTeacherId());
+								exercisesSituationDto.setEducationalTeacherName(studentEduTeacherDto.getEducationalTeacherName());
 								break;
 							}
 						}