Merge branch 'feature/0721-tenant' into develop

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

@@ -143,17 +143,12 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
 
             //是否收藏
             Long id = m.getId();
-            List<MusicFavorite> list = musicFavoriteService.lambdaQuery().eq(MusicFavorite::getMusicSheetId, id).list();
+            List<MusicFavorite> list = musicFavoriteService.lambdaQuery()
+                    .eq(MusicFavorite::getMusicSheetId, id)
+                    .eq(MusicFavorite::getUserId,sysUserId)
+                    .eq(MusicFavorite::getClientType,query.getClientType()).list();
             if (CollectionUtils.isNotEmpty(list)){
-                List<Long> collect = list.stream().map(MusicFavorite::getUserId).collect(Collectors.toList());
-                if (CollectionUtils.isNotEmpty(collect)){
-                    collect.stream().forEach(c->{
-                        if (c.equals(sysUserId) ){
-                            m.setFavorite(true);
-                        }
-                    });
-
-                }
+                m.setFavorite(true);
             }
 
         });