Merge branch 'feature/0803-im'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseCoursewareServiceImpl.java

@@ -76,19 +76,8 @@ public class CourseCoursewareServiceImpl extends ServiceImpl<CourseCoursewareDao
             return courseCoursewareVoIPage;
         }
         Map<Long, String> userIdUsernameMap = sysUsers.stream().collect(Collectors.toMap(SysUser::getId, SysUser::getUsername));
-        //获取曲目关联的伴奏
-        List<Long> musicSheetIds = records.stream().map(e -> e.getMusicSheetId()).distinct().collect(Collectors.toList());
-        Map<Long, MusicSheetAccompaniment> accoompanimentMap = musicSheetAccompanimentDao.selectList(
-                        Wrappers.<MusicSheetAccompaniment>lambdaQuery()
-                                .in(MusicSheetAccompaniment::getMusicSheetId, musicSheetIds)).stream()
-                .collect(Collectors.groupingBy(MusicSheetAccompaniment::getMusicSheetId, Collectors.collectingAndThen(Collectors.toList(), e -> e.get(0))));
         for (CourseCoursewareVo record : records) {
             record.setUsername(userIdUsernameMap.get(record.getUserId()));
-            MusicSheetAccompaniment musicSheetAccompaniment = accoompanimentMap.get(record.getMusicSheetId());
-            if (musicSheetAccompaniment != null) {
-                record.setMusicSheetAccompanimentId(musicSheetAccompaniment.getId());
-                record.setUrl(musicSheetAccompaniment.getMetronomeUrl());
-            }
         }
 
         // 设置原音

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseCoursewareMapper.xml

@@ -35,6 +35,8 @@
         ,ms.payment_type_ as paymentType
         ,ms.music_img_ as musicImg
         ,ms.title_img_ as titleImg
+		,CASE WHEN ms.audio_file_url_ IS NOT NULL AND ms.audio_file_url_ != '' THEN ms.audio_file_url_
+        WHEN ms.metronome_url_ IS NOT NULL AND ms.metronome_url_ != '' THEN ms.metronome_url_ ELSE ms.url_ END AS url
 		FROM course_courseware t
         left join music_sheet ms on t.music_sheet_id_ = ms.id_
         <where>