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/impl/MusicSheetAuthRecordServiceImpl.java

@@ -125,7 +125,9 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
             String musicalInstrumentIds = addMusicSheet.getMusicalInstrumentIds();
             List<Instrument> instruments = instrumentService.lambdaQuery().in(Instrument::getId, musicalInstrumentIds.split(",")).list();
             addMusicSheet.setMusicalInstrumentIds(musicalInstrumentIds);
-            addMusicSheet.setSubjectIds(instruments.stream().map(e->e.getSubjectId().toString()).distinct().collect(Collectors.joining(",")));
+            String subjectIds = instruments.stream().map(e -> e.getSubjectId().toString()).distinct().collect(Collectors.joining(","));
+            List<Subject> subjectList = subjectService.findBySubjectByIdList(subjectIds);
+            addMusicSheet.setSubjectIds(subjectList.stream().map(e -> e.getCbsSubjectId().toString()).distinct().collect(Collectors.joining(",")));
             R<Long> longR = musicFeignClientService.musicSheetAdd(addMusicSheet);
             if (!longR.getCode().equals(200)) {
                 throw new BizException("同步到内容平台失败");
@@ -184,7 +186,9 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         if(CollectionUtils.isEmpty(list)){
             throw new BizException("乐器信息不存在");
         }
-        addMusicSheet.setSubjectIds(list.stream().map(e->e.getSubjectId().toString()).distinct().collect(Collectors.joining(",")));
+        String subjectIds = list.stream().map(e -> e.getSubjectId().toString()).distinct().collect(Collectors.joining(","));
+        List<Subject> subjectList = subjectService.findBySubjectByIdList(subjectIds);
+        addMusicSheet.setSubjectIds(subjectList.stream().map(e -> e.getId().toString()).distinct().collect(Collectors.joining(",")));
         List<CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend> extendList = new ArrayList<>();
         CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend extend = new CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend();
         extend.setApplicationId(applicationId);