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

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

@@ -210,7 +210,7 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
         Map<Long, SysMusicScore> musicScoreMap = new HashMap<>();
         if (CollectionUtils.isNotEmpty(musicScoreIds)) {
             List<SysMusicScore> musicScores = sysMusicScoreService.getDao().findByCbsId(musicScoreIds,false);
-            musicScoreMap = musicScores.stream().collect(Collectors.toMap(e -> e.getId().longValue(), o -> o));
+            musicScoreMap = musicScores.stream().collect(Collectors.toMap(e -> Long.parseLong(e.getCbsMusicSheetId()), o -> o));
         }
         //获取知识点下的素材列表、下面关联的资源列表,如果applicationIdList是空的，那么把他剔除掉
         this.setTreeResourceId(detail.getKnowledgePointList(),query,musicScoreMap);