Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into develop-new

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

@@ -248,7 +248,6 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         musicSheetAuthRecord.setAuditState(AuthStatusEnum.DOING);
         musicSheetAuthRecord.setMusicSheetId(musicSheet.getId());
         musicSheetAuthRecord.setMusicSheetJson(JSON.toJSONString(addMusicSheet));
-        musicSheetAuthRecord.setId(IdWorker.getId());
         return baseMapper.insert(musicSheetAuthRecord);
     }
 

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

@@ -387,7 +387,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
     public MusicSheetDetailVo getCbsDetail(Long id) {
         MusicSheet musicSheet = this.baseMapper.get(id);
-        if (musicSheet == null || musicSheet.getDelFlag()) {
+        if (musicSheet == null) {
             throw new BizException("未找到曲目信息");
         }
         if(musicSheet.getCbsMusicSheetId() == null){
@@ -657,7 +657,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             } else if (ClientEnum.STUDENT.getCode().equals(userType.getCode())
                 || ClientEnum.TEACHER.getCode().equals(userType.getCode())) {
                 // 2022 7 20  老师也能购买曲目
-                if (ClientEnum.TEACHER.getCode().equals(userType.getCode()) && detail.getUserId().equals(sysUser.getId())) {
+                if (ClientEnum.TEACHER.getCode().equals(userType.getCode()) && sysUser.getId().equals(detail.getUserId())) {
                     detail.setPlay(YesOrNoEnum.YES);
                 } else {
                     setMusicSheetPlay(sysUser.getId(), detail, userType);