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/MusicSheetServiceImpl.java

@@ -597,7 +597,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     @Override
     public MusicSheetDetailVo detail(String id, SysUser sysUser, ClientEnum userType,String tenantAlbumId) {
         MusicSheetDetailVo detailVo = baseMapper.detail(Long.parseLong(id));
-        if (detailVo == null) {
+        if (detailVo == null || detailVo.getDelFlag()) {
             //获取待审核曲目信息
             MusicSheetAuthRecord record = musicSheetAuthRecordService.lambdaQuery().eq(MusicSheetAuthRecord::getId, id).last("LIMIT 1").one();
             if(Objects.nonNull(record)){
@@ -609,7 +609,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                     return JSON.parseObject(JSON.toJSONString(musicSheetDetailVo),MusicSheetDetailVo.class);
                 }
             }
-            throw new BizException("未找到曲目信息");
+            if(detailVo == null){
+                throw new BizException("未找到曲目信息");
+            }
         }
         if(detailVo.getDelFlag()){
             //获取乐器名称

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -336,7 +336,7 @@
         left join music_sheet_accompaniment msa on msa.music_sheet_id_ = t.id_
         left join sys_user su on t.create_by_ = su.id_
         left join subject s2 on t.music_subject_ = s2.id_
-        where t.id_ = #{id} AND t.del_flag_ = 0
+        where t.id_ = #{id}
          order by  msa.sort_number_
     </select>