Merge branch 'feature/1108_audio' into develop-new

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

@@ -1013,6 +1013,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                                                                 .eq(MusicFavorite::getUserId, query.getStudentId())
                                                                 .eq(MusicFavorite::getClientType, clientType)
                                                                 .in(MusicFavorite::getMusicSheetId, musicIdList)
+                                                                .in(MusicFavorite::getProviderType, "PLATFORM" )
                                                                 .list();
                 if (CollectionUtils.isNotEmpty(musicFavoriteList)) {
                     Set<Long> set = musicFavoriteList.stream()

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

@@ -151,6 +151,7 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
                     .in(MusicFavorite::getMusicSheetId, musicSheetIds)
                     .eq(MusicFavorite::getUserId, query.getUserId())
                     .eq(MusicFavorite::getClientType, query.getClientType().equals(ClientEnum.TENANT_STUDENT) ? ClientEnum.STUDENT : query.getClientType())
+                    .eq(MusicFavorite::getProviderType,"TENANT")
                     .list();
                 favoriteIds = favoriteList.stream().map(MusicFavorite::getMusicSheetId).distinct().collect(Collectors.toList());
             }