|
@@ -2721,6 +2721,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
first.ifPresent(musicSheetAccompaniment -> musicSheetDetail.setMp3Url(musicSheetAccompaniment.getAudioFileUrl()));
|
|
|
}
|
|
|
} else if (CollectionUtils.isNotEmpty(cbsMusicSheet.getMusicSheetSoundList())) {
|
|
|
+ musicSheetDetail.setMusicSheetSoundList(new ArrayList<>());
|
|
|
// 按乐器取原音 有乐器按乐器来,没乐器用声部,都不匹配取第一个
|
|
|
List<CbsMusicSheetWrapper.MusicSheetSound> sheetSoundList = cbsMusicSheet.getMusicSheetSoundList().stream().filter(o -> o.getAudioPlayType() == EAudioPlayType.PLAY).collect(Collectors.toList());
|
|
|
if (query.getInstrumentId() !=null) {
|
|
@@ -2741,7 +2742,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- } else {
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(musicSheetDetail.getMusicSheetSoundList())) {
|
|
|
Optional<CbsMusicSheetWrapper.MusicSheetSound> first = sheetSoundList.stream().findFirst();
|
|
|
if (first.isPresent()) {
|
|
|
musicSheetDetail.setMp3Url(first.get().getAudioFileUrl());
|
|
@@ -2749,6 +2751,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
}
|
|
|
return musicSheetDetail;
|
|
|
}
|