zouxuan 2 years ago
parent
commit
dec9efa54e

+ 15 - 13
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -179,19 +179,21 @@ public class StudentManageServiceImpl implements StudentManageService {
                 }
                 dto.setSubjectName(subjectMap.get(dto.getSubjectIdList()));
                 dto.setCooperationOrganName(cooMap.get(dto.getCooperationOrganId()));
-                List<StudentTeacherMapperDto> mapperList = mappersMap.get(dto.getUserId());
-                if(!CollectionUtils.isEmpty(mapperList)){
-                    Map<String, List<StudentTeacherMapperDto>> collect = mapperList.stream().collect(Collectors.groupingBy(StudentTeacherMapperDto::getTeacherType));
-                    for (String s : collect.keySet()) {
-                        String teacherName = collect.get(s).stream().map(e -> e.getTeacherName()).collect(Collectors.joining(","));
-                        if("VIP".equals(s)){
-                            dto.setVipTeacherName(teacherName);
-                        }else if("PRACTICE".equals(s)){
-                            dto.setPracticeTeacherName(teacherName);
-                        }else if("NORMAL".equals(s)){
-                            dto.setNormalTeacherName(teacherName);
-                        }else {
-                            dto.setMixTeacherName(teacherName);
+                if(!CollectionUtils.isEmpty(mappersMap)){
+                    List<StudentTeacherMapperDto> mapperList = mappersMap.get(dto.getUserId());
+                    if(!CollectionUtils.isEmpty(mapperList)){
+                        Map<String, List<StudentTeacherMapperDto>> collect = mapperList.stream().collect(Collectors.groupingBy(StudentTeacherMapperDto::getTeacherType));
+                        for (String s : collect.keySet()) {
+                            String teacherName = collect.get(s).stream().map(e -> e.getTeacherName()).collect(Collectors.joining(","));
+                            if("VIP".equals(s)){
+                                dto.setVipTeacherName(teacherName);
+                            }else if("PRACTICE".equals(s)){
+                                dto.setPracticeTeacherName(teacherName);
+                            }else if("NORMAL".equals(s)){
+                                dto.setNormalTeacherName(teacherName);
+                            }else {
+                                dto.setMixTeacherName(teacherName);
+                            }
                         }
                     }
                 }