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

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

@@ -221,8 +221,10 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
             for (CbsLessonCoursewareDetailWrapper.MaterialSmall materialSmall : materialList) {
                 if(materialSmall.getType() == EMaterialType.SONG){
                     SysMusicScore musicScore = sysMusicScoreService.getDao().getCbsId(Long.parseLong(materialSmall.getContent()));
-                    if(musicScore != null) {
+                    if(musicScore != null && musicScore.getShowFlag() == 1) {
                         materialSmall.setContent(musicScore.getId().toString());
+                    }else {
+                        materialSmall.setContent(null);
                     }
                 }
                 List<CbsMaterialRefWrapper.AddMaterialRef> materialRefs = materialSmall.getMaterialRefs();
@@ -232,13 +234,15 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
                         if(relateMaterialInfo != null && StringUtils.equals(relateMaterialInfo.getType(),"SONG")
                                 && CollectionUtils.isNotEmpty(relateMaterialInfo.getApplicationIdList())){
                             SysMusicScore musicScore = sysMusicScoreService.getDao().getCbsId(relateMaterialInfo.getId());
-                            if(musicScore != null) {
+                            if(musicScore != null && musicScore.getShowFlag() == 1) {
                                 materialRef.setResourceIdStr(musicScore.getId().toString());
                             }
                         }
                     }
                 }
             }
+            //剔除掉视频素材，且没有content的数据
+            materialList.removeIf(materialSmall -> materialSmall.getType() == EMaterialType.SONG && StringUtils.isEmpty(materialSmall.getContent()));
         }
     }
 }