Merge branch 'feature/0721-tenant' into develop

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

@@ -1774,7 +1774,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                     musicName.setId(record.getId());
                     musicName.setName(record.getMusicSheetName());
                     musicName.setType("MUSIC");
-                    musicName.setSort(record.getFavoriteCount());
+                    musicName.setSort(Optional.ofNullable(record.getFavoriteCount()).orElse(0));
                     musicNames.add(musicName);
                 }
                 searchData.setMusic(PageUtil.pageInfo(musicSheetVoIPage));
@@ -1794,7 +1794,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                     musicName.setId(record.getId());
                     musicName.setName(record.getAlbumName());
                     musicName.setType("MUSIC");
-                    musicName.setSort(record.getAlbumFavoriteCount());
+                    musicName.setSort(Optional.ofNullable(record.getAlbumFavoriteCount()).orElse(0));
                     musicNames.add(musicName);
                 }
                 searchData.setAlbum(PageUtil.pageInfo(musicAlbumVoIPage));