diff --git a/application/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java b/application/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java index b4a0a2257..c1587c868 100644 --- a/application/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java +++ b/application/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java @@ -152,7 +152,7 @@ public class CommentServiceImpl implements CommentService { Sort.by("metadata.creationTimestamp", "metadata.name")); return Flux.defer(() -> listCommentsByRef(subjectRef, pageRequest)) .expand(page -> page.hasNext() - ? listCommentsByRef(subjectRef, pageRequest) + ? listCommentsByRef(subjectRef, pageRequest.next()) : Mono.empty() ) .flatMap(page -> Flux.fromIterable(page.getItems())) diff --git a/application/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java b/application/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java index 9b6c8d198..65f6ee14d 100644 --- a/application/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java +++ b/application/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java @@ -123,7 +123,7 @@ public class ReplyServiceImpl implements ReplyService { Sort.by("metadata.creationTimestamp", "metadata.name")); return Flux.defer(() -> listRepliesByComment(commentName, pageRequest)) .expand(page -> page.hasNext() - ? listRepliesByComment(commentName, pageRequest) + ? listRepliesByComment(commentName, pageRequest.next()) : Mono.empty() ) .flatMap(page -> Flux.fromIterable(page.getItems())) diff --git a/application/src/main/java/run/halo/app/notification/DefaultNotificationCenter.java b/application/src/main/java/run/halo/app/notification/DefaultNotificationCenter.java index eb59f22d5..5d4ae677c 100644 --- a/application/src/main/java/run/halo/app/notification/DefaultNotificationCenter.java +++ b/application/src/main/java/run/halo/app/notification/DefaultNotificationCenter.java @@ -98,7 +98,7 @@ public class DefaultNotificationCenter implements NotificationCenter { Sort.by("metadata.creationTimestamp", "metadata.name")); return Flux.defer(() -> pageSubscriptionBy(subscriber, pageRequest)) .expand(page -> page.hasNext() - ? pageSubscriptionBy(subscriber, pageRequest) + ? pageSubscriptionBy(subscriber, pageRequest.next()) : Mono.empty() ) .flatMap(page -> Flux.fromIterable(page.getItems()))