Merge branch 'dev_v1.3.7_20221020'

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

@@ -615,6 +615,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     public boolean del(Long id) {
 
         MusicSheet musicSheet = super.getById(id);
+        if (musicSheet == null) {
+            throw new BizException("曲目不存在");
+        }
         if (YesOrNoEnum.YES.getCode().equals(musicSheet.getState().getCode())) {
             throw new BizException("启用状态下，不可删除");
         }
@@ -721,6 +724,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             return;
         }
         MusicSheet musicSheet = this.getById(id);
+        if (musicSheet == null) {
+            throw new BizException("曲目不存在");
+        }
         if (musicSheet.getMusicSubject().equals(subjectId)) {
             return;
         }
@@ -1141,6 +1147,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     @Override
     public MusicSheetWebsiteDetailVo websiteDetail(Long musicSheetId, SysUser sysUser, ClientEnum clientType) {
         MusicSheetDetailVo detail = detail(musicSheetId, null, null);
+        if (detail == null) {
+            throw new BizException("曲目不存在");
+        }
         MusicSheetWebsiteDetailVo musicSheetWebsiteDetailVo = new MusicSheetWebsiteDetailVo();
         BeanUtils.copyProperties(detail, musicSheetWebsiteDetailVo);
 
@@ -1173,7 +1182,11 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 musicSheetWebsiteDetailVo.setFavorite(YesOrNoEnum.YES);
             }
         }
-        musicSheetWebsiteDetailVo.setFavoriteNum(Long.valueOf(detail.getFavoriteCount()));
+        Integer favoriteCount = detail.getFavoriteCount();
+        if (favoriteCount == null) {
+            favoriteCount = 0;
+        }
+        musicSheetWebsiteDetailVo.setFavoriteNum(Long.valueOf(favoriteCount));
 
         // 老师的曲目
         MusicSheetSearch musicSheetSearch = new MusicSheetSearch();