|
|
@@ -655,10 +655,14 @@ public class CollectionService {
|
|
|
PageWrapper<Collection> dtoPage = new PageWrapper<>(page.getContent(), page.getPageable().getPageNumber(),
|
|
|
page.getPageable().getPageSize(), page.getTotalElements());
|
|
|
Page<CollectionDTO> pageNew = toDTO(dtoPage.toPage());
|
|
|
- subscribeListDTOS
|
|
|
- .add(SubscribeListDTO.builder().dateTime(subscribeTime.getStart())
|
|
|
- .collectionDTOS(pageNew.getContent())
|
|
|
- .build());
|
|
|
+ LocalDateTime dateTime;
|
|
|
+ if (pageNew.getTotalElements() > 0){
|
|
|
+ dateTime = pageNew.getContent().get(0).getStartTime();
|
|
|
+ subscribeListDTOS
|
|
|
+ .add(SubscribeListDTO.builder().dateTime(dateTime)
|
|
|
+ .collectionDTOS(pageNew.getContent())
|
|
|
+ .build());
|
|
|
+ }
|
|
|
});
|
|
|
// resultMap.put("notSubscribedIds", );
|
|
|
return subscribeListDTOS;
|