Merge remote-tracking branch 'origin/develop' into develop

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

@@ -370,6 +370,15 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
 
         insertAlbumMusic(tenantId, tenantAlbum, musicSheetDataList);
 
+        // 删除原始关联数据，添加新关联数据
+        tenantAlbumRefService.lambdaUpdate()
+                .eq(TenantAlbumRef::getTenantAlbumId, tenantAlbum.getId())
+                .remove();
+
+        TenantAlbumRef ref = new TenantAlbumRef();
+        ref.setTenantAlbumId(tenantAlbum.getId());
+        ref.setTenantId(tenantId);
+        tenantAlbumRefService.add(ref);
     }
 
     @Override
@@ -437,7 +446,6 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
         tenantAlbumPurchaseService.updateById(tenantAlbumPurchase);
     }
 
-    @Transactional(rollbackFor = Exception.class)
     private void insertAlbumMusic(Long tenantId, TenantAlbum tenantAlbum,
                                   List<TenantAlbumWrapper.MusicSheetData> musicSheetDataList) {
         //曲目表赋值