|
@@ -276,7 +276,7 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
|
|
|
return null;
|
|
|
}
|
|
|
TenantAlbumMusic tenantAlbumMusic = tenantAlbumMusicList.get(0);
|
|
|
- tenantAlbumId = tenantAlbumMusic.getTenantAlbumId();
|
|
|
+ tenantAlbumId = tenantAlbumMusic.getTenantAlbumId();
|
|
|
} else {
|
|
|
//如果传专辑id 则查询这个专辑的详情
|
|
|
tenantAlbumId = Long.parseLong(albumId);
|
|
@@ -345,9 +345,9 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
|
|
|
//机构专辑曲目数
|
|
|
List<TenantAlbumMusic> tenantAlbumMusiclist = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getTenantAlbumId, tenantAlbumId).eq(TenantAlbumMusic::getDelFlag,false).list();
|
|
|
List<Long> MusicSheetIds = tenantAlbumMusiclist.stream().map(TenantAlbumMusic::getMusicSheetId).distinct().collect(Collectors.toList());
|
|
|
- //计算符合条件的个数
|
|
|
+ //计算符合条件的个数
|
|
|
if (CollectionUtils.isNotEmpty(MusicSheetIds)){
|
|
|
- size = musicSheetService.lambdaQuery().in(MusicSheet::getId, MusicSheetIds).eq(MusicSheet::getState, true)
|
|
|
+ size = musicSheetService.lambdaQuery().in(MusicSheet::getId, MusicSheetIds).eq(MusicSheet::getState, true)
|
|
|
.eq(MusicSheet::getDelFlag, false).count();
|
|
|
}
|
|
|
//Integer musicNum = tenantAlbum.getMusicNum();
|