Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into develop-new

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

@@ -18,7 +18,7 @@ import javax.annotation.Resource;
 @Service
 public class CbsMusicScoreServiceImpl implements CbsMusicScoreService {
 
-    @Value("${openfeign-client.app-id:1744906758234759169}")
+    @Value("${openfeign-client.app-id:1745637981387108354}")
     public Long applicationId;
     @Resource
     private MusicFeignClientService musicFeignClientService;

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

@@ -42,7 +42,7 @@ public class CbsMusicSheetServiceImpl implements CbsMusicSheetService {
         }
         List<Long> cbsMusicSheetIds = addMusicSheet.stream().map(e -> e.getMusicSheetId()).collect(Collectors.toList());
         //需要修改的曲目
-        List<MusicSheet> musicSheets = musicSheetService.lambdaQuery().in(MusicSheet::getId, cbsMusicSheetIds).list();
+        List<MusicSheet> musicSheets = musicSheetService.lambdaQuery().in(MusicSheet::getCbsMusicSheetId, cbsMusicSheetIds).list();
         if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(musicSheets)){
             List<Long> collect = musicSheets.stream().map(e -> e.getCbsMusicSheetId()).collect(Collectors.toList());
             //获取需要修改的曲目