Merge branch 'fix/0718' into test

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumController.java

@@ -138,7 +138,6 @@ public class TenantAlbumController {
             search.setMusicSheetIdlist(musicSheetIdlist);
             search.setPage(1);
             search.setRows(9999);
-            search.setDelFlag(null);
             IPage<MusicSheetVo> records = musicSheetService.selectStudentPage(PageUtil.getPage(search), search, null);
             idMsMap.putAll(records.getRecords().stream()
                 .collect(Collectors.toMap(MusicSheet::getId, Function.identity())));
@@ -161,13 +160,18 @@ public class TenantAlbumController {
                             tenantAlbumSheet.setTitleImg(entity.getCoverImg());
                             tenantAlbumSheet.setMusicSubject(entity.getCourseTypeCode());
                             tenantAlbumSheet.setMusicSubjectName(ECourseType.valueOf(entity.getCourseTypeCode()).getName());
+                        } else {
+                            return null;
                         }
                         break;
                     case MUSIC:
                     case SUBJECT:
                     case ENSEMBLE:
                     {
-                        MusicSheetVo musicSheet = idMsMap.getOrDefault(musicSheetId, new MusicSheetVo());
+                        MusicSheetVo musicSheet = idMsMap.get(musicSheetId);
+                        if (musicSheet == null) {
+                            return null;
+                        }
                         tenantAlbumSheet.setMusicSheetName(musicSheet.getMusicSheetName());
                         tenantAlbumSheet.setMusicTag(musicSheet.getMusicTag());
                         tenantAlbumSheet.setComposer(musicSheet.getComposer());
@@ -204,7 +208,7 @@ public class TenantAlbumController {
                 }
 
                 return tenantAlbumSheet;
-            }).collect(Collectors.toList());
+            }).filter(Objects::nonNull).collect(Collectors.toList());
 
             sheetData.setTenantAlbumSheetList(tenantAlbumSheets);
             musicSheetData.add(sheetData);

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

@@ -847,7 +847,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             query.setRows(cbsMusicSheetIds.size());
             query.setMusicSheetIds(cbsMusicSheetIds);
             query.setDetailFlag(true);
-            query.setDelFlag(true);
             R<PageInfo<CbsMusicSheetWrapper.MusicSheetApplication>> pageInfoR = cbsMusicScoreService.selectPage(query);
             if(pageInfoR.getCode() != 200){
                 throw new BizException("获取曲目信息失败");