Merge remote-tracking branch 'origin/dev_1_2_20220802' into dev_1_2_20220802

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

@@ -274,6 +274,9 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
         String roomTitle = WrapperUtil.toStr(param, "roomTitle", "房间标题不能为空!");
         String liveRemark = WrapperUtil.toStr(param, "liveRemark", "直播间描述不能为空!");
         Integer liveTime = WrapperUtil.toInt(param, "liveTime", "请选择直播时长!");
+        if (roomTitle.length() > 12) {
+            throw new BizException("房间标题不能超出12个字");
+        }
         Date liveStartTime = new Date();
         Date liveEndTime = DateUtil.addMinutes(liveStartTime, liveTime);
         //当前时间有课程则不能开启直播

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

@@ -443,7 +443,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         }
 
         // 删除曲目专辑关联
-        delAlbumSheetRef(musicSheetDto.getId(), musicSheetDto.getMusicSubject());
+        // delAlbumSheetRef(musicSheetDto.getId(), musicSheetDto.getMusicSubject());
 
         List<MusicSheetAccompaniment> list;
         if (!AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())) {