|  | @@ -81,8 +81,8 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 | 
											
												
													
														|  |  					if(!CollectionUtils.isEmpty(t1)){
 |  |  					if(!CollectionUtils.isEmpty(t1)){
 | 
											
												
													
														|  |  						for (StudentEduTeacherDto studentEduTeacherDto : t1) {
 |  |  						for (StudentEduTeacherDto studentEduTeacherDto : t1) {
 | 
											
												
													
														|  |  							if(StringUtils.isNotBlank(studentEduTeacherDto.getEducationalTeacherName())){
 |  |  							if(StringUtils.isNotBlank(studentEduTeacherDto.getEducationalTeacherName())){
 | 
											
												
													
														|  | -								exercisesSituationDto.setEducationalTeacherId(studentEduTeachers.get(0).getEducationalTeacherId());
 |  | 
 | 
											
												
													
														|  | -								exercisesSituationDto.setEducationalTeacherName(studentEduTeachers.get(0).getEducationalTeacherName());
 |  | 
 | 
											
												
													
														|  | 
 |  | +								exercisesSituationDto.setEducationalTeacherId(studentEduTeacherDto.getEducationalTeacherId());
 | 
											
												
													
														|  | 
 |  | +								exercisesSituationDto.setEducationalTeacherName(studentEduTeacherDto.getEducationalTeacherName());
 | 
											
												
													
														|  |  								break;
 |  |  								break;
 | 
											
												
													
														|  |  							}
 |  |  							}
 | 
											
												
													
														|  |  						}
 |  |  						}
 | 
											
										
											
												
													
														|  | @@ -94,8 +94,8 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 | 
											
												
													
														|  |  					if(!CollectionUtils.isEmpty(t2)){
 |  |  					if(!CollectionUtils.isEmpty(t2)){
 | 
											
												
													
														|  |  						for (StudentEduTeacherDto studentEduTeacherDto : t2) {
 |  |  						for (StudentEduTeacherDto studentEduTeacherDto : t2) {
 | 
											
												
													
														|  |  							if(StringUtils.isNotBlank(studentEduTeacherDto.getEducationalTeacherName())){
 |  |  							if(StringUtils.isNotBlank(studentEduTeacherDto.getEducationalTeacherName())){
 | 
											
												
													
														|  | -								exercisesSituationDto.setEducationalTeacherId(studentEduTeachers.get(0).getEducationalTeacherId());
 |  | 
 | 
											
												
													
														|  | -								exercisesSituationDto.setEducationalTeacherName(studentEduTeachers.get(0).getEducationalTeacherName());
 |  | 
 | 
											
												
													
														|  | 
 |  | +								exercisesSituationDto.setEducationalTeacherId(studentEduTeacherDto.getEducationalTeacherId());
 | 
											
												
													
														|  | 
 |  | +								exercisesSituationDto.setEducationalTeacherName(studentEduTeacherDto.getEducationalTeacherName());
 | 
											
												
													
														|  |  								break;
 |  |  								break;
 | 
											
												
													
														|  |  							}
 |  |  							}
 | 
											
												
													
														|  |  						}
 |  |  						}
 |