소스 검색

Merge branch 'zx_saas_homework_1011' of http://git.dayaedu.com/yonge/mec into dev

zouxuan 1 년 전
부모
커밋
01ffd91431
1개의 변경된 파일3개의 추가작업 그리고 1개의 파일을 삭제
  1. 3 1
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentLessonExaminationServiceImpl.java

+ 3 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentLessonExaminationServiceImpl.java

@@ -126,7 +126,9 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
                             StudentLessonExaminationDetailDto detailDto = JSON.parseObject(JSON.toJSONString(detail), StudentLessonExaminationDetailDto.class);
                             if(detail.getMusicScoreId() != null){
                                 SysMusicScore musicScore = musicScoreMap.get(detail.getMusicScoreId().intValue());
-                                detailDto.setMusicScoreName(musicScore.getName());
+                                if (musicScore != null){
+                                    detailDto.setMusicScoreName(musicScore.getName());
+                                }
                             }
                             dto.setStudentLessonExaminationDetail(detailDto);
                         }