diff --git a/src/main/java/run/halo/app/content/impl/PostServiceImpl.java b/src/main/java/run/halo/app/content/impl/PostServiceImpl.java index 1364b6c1f..9bc73e4b6 100644 --- a/src/main/java/run/halo/app/content/impl/PostServiceImpl.java +++ b/src/main/java/run/halo/app/content/impl/PostServiceImpl.java @@ -93,7 +93,7 @@ public class PostServiceImpl implements PostService { Predicate paramPredicate = post -> contains(query.getCategories(), post.getSpec().getCategories()) && contains(query.getTags(), post.getSpec().getTags()) - && contains(query.getContributors(), post.getStatus().getContributors()); + && contains(query.getContributors(), post.getStatusOrDefault().getContributors()); String keyword = query.getKeyword(); if (keyword != null) { @@ -162,7 +162,7 @@ public class PostServiceImpl implements PostService { ) .flatMap(lp -> setTags(post.getSpec().getTags(), lp)) .flatMap(lp -> setCategories(post.getSpec().getCategories(), lp)) - .flatMap(lp -> setContributors(post.getStatus().getContributors(), lp)) + .flatMap(lp -> setContributors(post.getStatusOrDefault().getContributors(), lp)) .flatMap(lp -> setOwner(post.getSpec().getOwner(), lp)); } diff --git a/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java b/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java index 723b56cef..43b243bf5 100644 --- a/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java +++ b/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java @@ -14,7 +14,6 @@ import java.util.function.Predicate; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.context.ApplicationContext; import org.springframework.dao.OptimisticLockingFailureException; import org.springframework.security.core.context.ReactiveSecurityContextHolder; import org.springframework.security.core.context.SecurityContext; @@ -60,8 +59,6 @@ public class SinglePageServiceImpl implements SinglePageService { private final CounterService counterService; - private final ApplicationContext applicationContext; - @Override public Mono> list(SinglePageQuery query) { Comparator comparator =