|
@@ -1896,15 +1896,15 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
albumIds = albumList.stream().map(TenantAlbum::getId).distinct().collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
- List<UserTenantAlbumRecord> recordList = userTenantAlbumRecordService
|
|
|
- .getNewestByTenantIdAndUserId(student.getTenantId(), queryInfo.getUserId(), ClientEnum.STUDENT, albumIds);
|
|
|
-
|
|
|
- if (CollectionUtils.isNotEmpty(recordList)) {
|
|
|
- albumIds = recordList.stream().map(UserTenantAlbumRecord::getTenantAlbumId).distinct().collect(Collectors.toList());
|
|
|
- queryInfo.setTenantAlbumIds(albumIds);
|
|
|
- } else {
|
|
|
- return searchData;
|
|
|
- }
|
|
|
+// List<UserTenantAlbumRecord> recordList = userTenantAlbumRecordService
|
|
|
+// .getNewestByTenantIdAndUserId(student.getTenantId(), queryInfo.getUserId(), ClientEnum.STUDENT, albumIds);
|
|
|
+//
|
|
|
+// if (CollectionUtils.isNotEmpty(recordList)) {
|
|
|
+// albumIds = recordList.stream().map(UserTenantAlbumRecord::getTenantAlbumId).distinct().collect(Collectors.toList());
|
|
|
+// } else {
|
|
|
+// return searchData;
|
|
|
+// }
|
|
|
+ queryInfo.setTenantAlbumIds(albumIds);
|
|
|
|
|
|
// 查询曲目列表
|
|
|
List<Long> musicIds = musicSheetDao.searchMusic(PageUtil.getPage(queryInfo),queryInfo);
|