Merge branch 'feature/1210_audio' into test

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetCbsController.java

@@ -184,10 +184,12 @@ public class MusicSheetCbsController extends BaseController {
         cbsMusicSheet.setBizId(id);
 
         // 设置查询机构 还是平台数据
-        if (StringUtils.isNotBlank(providerType) && SourceTypeEnum.PLATFORM.name().equals(providerType)) {
-            tenantAlbumId = null;
-        } else {
-            tenantAlbumId = StringUtils.isBlank(tenantAlbumId) ? null : "1";
+        if (StringUtils.isBlank(tenantAlbumId) && StringUtils.isNotBlank(providerType)) {
+            if (SourceTypeEnum.PLATFORM.name().equals(providerType)) {
+                tenantAlbumId = null;
+            } else {
+                tenantAlbumId = "1";
+            }
         }
 
         MusicSheetVo.MusicSheetDetail musicSheetDetail = JSON.parseObject(JSON.toJSONString(cbsMusicSheet), MusicSheetVo.MusicSheetDetail.class);