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

mec-application/src/main/java/com/ym/mec/student/controller/LessonCoursewareController.java

@@ -163,7 +163,7 @@ public class LessonCoursewareController extends BaseController {
             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));
             }
             for (CbsLessonCoursewareWrapper.CourseScheduleCoursewareDetail e : courseScheduleCoursewareDetails) {
                 lessonCoursewareService.setTreeResourceId(e.getKnowledgePointList(), query1, musicScoreMap);

mec-application/src/main/java/com/ym/mec/teacher/controller/LessonCoursewareController.java

@@ -96,7 +96,7 @@ public class LessonCoursewareController extends BaseController {
 			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));
 			}
 			for (CbsLessonCoursewareWrapper.CourseScheduleCoursewareDetail e : courseScheduleCoursewareDetails) {
 				lessonCoursewareService.setTreeResourceId(e.getKnowledgePointList(), query1, musicScoreMap);