@@ -26,5 +26,5 @@ public interface SubscribeTimeRepo extends JpaRepository<SubscribeTime, Long>, J
SubscribeTime save(@Nonnull SubscribeTime subscribeTime);
@Cacheable(value = "subscribeTimeList")
- List<SubscribeTime> findAllByStartAfterOrderBySort(LocalDateTime localDateTime);
+ List<SubscribeTime> findAllByStartAfterAndDelOrderBySort(LocalDateTime localDateTime, boolean del);
}
@@ -620,7 +620,7 @@ public class CollectionService {
// .map(CollectionDTO::getId).collect(Collectors
// .toList()));
List<SubscribeTime> subscribeTimes = subscribeTimeRepo
- .findAllByStartAfterOrderBySort(LocalDate.now().atStartOfDay());
+ .findAllByStartAfterAndDelOrderBySort(LocalDate.now().atStartOfDay(), false);
subscribeTimes.forEach(subscribeTime -> {
PageQuery pageQuery = new PageQuery();
pageQuery.setPage(0);