查询

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

@@ -1703,7 +1703,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     public MusicCompareWrapper.SearchData search(MusicCompareWrapper.MusicSearch queryInfo) {
         MusicCompareWrapper.SearchData searchData= new MusicCompareWrapper.SearchData();
         List<MusicCompareWrapper.MusicName> musicNames = new ArrayList<>();
-        if (queryInfo.getType() == null || queryInfo.getType().equals("MUSIC")) {
+        if (StringUtil.isEmpty(queryInfo.getType()) || queryInfo.getType().equals("MUSIC")) {
 
             PageUtil.getPage(queryInfo);
             // 查询曲目列表
@@ -1724,7 +1724,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 searchData.setMusic(PageUtil.pageInfo(musicSheetVoIPage));
             }
         }
-        if (queryInfo.getType() == null || queryInfo.getType().equals("ALBUM")) {
+        if (StringUtil.isEmpty(queryInfo.getType()) || queryInfo.getType().equals("ALBUM")) {
 
             // 查询专辑列表
             List<Long> albumIds = musicSheetDao.searchAlbum(PageUtil.getPage(queryInfo),queryInfo);
@@ -1737,7 +1737,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                     MusicCompareWrapper.MusicName musicName = new MusicCompareWrapper.MusicName();
                     musicName.setId(record.getId());
                     musicName.setName(record.getAlbumName());
-                    musicName.setType("MUSIC");
+                    musicName.setType("ALBUM");
                     musicName.setSort(Optional.ofNullable(record.getAlbumFavoriteCount()).orElse(0));
                     musicNames.add(musicName);
                 }