|
|
@@ -214,10 +214,12 @@ public class TenantGroupAlbumServiceImpl extends ServiceImpl<TenantGroupAlbumMap
|
|
|
}
|
|
|
|
|
|
for (TenantGroupAlbumWrapper.BuyTenantAlbum item : buyAlbumInfo) {
|
|
|
- item.setBuyedTimes((int) studentTenantAlbumNum.stream().filter(x -> x.equals(item.getTenantGroupAlbumId())).count());
|
|
|
- if (item.getBuyedTimes() > item.getBuyTimes()) {
|
|
|
- item.setBuyedTimes(item.getBuyTimes());
|
|
|
- }
|
|
|
+ if(studentTenantAlbumNum != null && studentTenantAlbumNum.size() > 0) {
|
|
|
+ item.setBuyedTimes((int) studentTenantAlbumNum.stream().filter(x -> x.equals(item.getTenantGroupAlbumId())).count());
|
|
|
+ if (item.getBuyedTimes() > item.getBuyTimes()) {
|
|
|
+ item.setBuyedTimes(item.getBuyTimes());
|
|
|
+ }
|
|
|
+ }
|
|
|
item.setStatus(albumRecordMap.containsKey(item.getId()));
|
|
|
UserTenantAlbumRecord userTenantAlbumRecord = albumRecordMap.get(item.getId());
|
|
|
if (userTenantAlbumRecord != null) {
|