Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into test

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

@@ -131,6 +131,7 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
                             for (StudentLessonExaminationDetail detail : detailList) {
                                 dto.setMemo(detail.getMemo());
                                 String fileJson1 = detail.getFileJson();
+                                detail.setFileJson(null);
                                 StudentLessonExaminationDetailDto detailDto = JSON.parseObject(JSON.toJSONString(detail), StudentLessonExaminationDetailDto.class);
                                 if (detail.getMusicScoreId() != null && "MUSIC_SCORE".equals(detail.getHomeworkType())) {
                                     SysMusicScore musicScore = musicScoreMap.get(detail.getMusicScoreId().intValue());
@@ -139,7 +140,6 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
                                     }
                                 }
                                 if (StringUtils.isNotEmpty(fileJson1)) {
-                                    detail.setFileJson(null);
                                     detailDto.setFileJson(JSON.parseArray(fileJson1, CourseHomeworkWrapper.FileJson.class));
                                     if (CollectionUtils.isNotEmpty(detailDto.getFileJson())) {
                                         for (CourseHomeworkWrapper.FileJson fileJson : detailDto.getFileJson()) {