From b0c461b5f6c37519bed2db485f0cd3f88ae0c9ed Mon Sep 17 00:00:00 2001
From: guqing <38999863+guqing@users.noreply.github.com>
Date: Wed, 23 Nov 2022 17:21:30 +0800
Subject: [PATCH] fix: inconsistent order of post for theme-side (#2742)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#### What type of PR is this?
/kind improvement
/area core
/milestone 2.0.0-rc.1

#### What this PR does / why we need it:
修复主题端文章列表排序不固定问题
#### Which issue(s) this PR fixes:

Fixes #2734

#### Special notes for your reviewer:
/cc @halo-dev/sig-halo
#### Does this PR introduce a user-facing change?

```release-note
修复主题端文章列表排序不固定问题
```
---
 .../halo/app/theme/finders/impl/ContributorFinderImpl.java    | 2 +-
 .../java/run/halo/app/theme/finders/impl/PostFinderImpl.java  | 4 ++--
 .../run/halo/app/theme/finders/impl/SinglePageFinderImpl.java | 2 +-
 .../java/run/halo/app/theme/finders/impl/TagFinderImpl.java   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/run/halo/app/theme/finders/impl/ContributorFinderImpl.java b/src/main/java/run/halo/app/theme/finders/impl/ContributorFinderImpl.java
index ecbcbf28b..60e6b7e55 100644
--- a/src/main/java/run/halo/app/theme/finders/impl/ContributorFinderImpl.java
+++ b/src/main/java/run/halo/app/theme/finders/impl/ContributorFinderImpl.java
@@ -36,6 +36,6 @@ public class ContributorFinderImpl implements ContributorFinder {
             return Flux.empty();
         }
         return Flux.fromIterable(names)
-            .flatMap(this::getContributor);
+            .concatMap(this::getContributor);
     }
 }
diff --git a/src/main/java/run/halo/app/theme/finders/impl/PostFinderImpl.java b/src/main/java/run/halo/app/theme/finders/impl/PostFinderImpl.java
index a59a6fe54..f49f91a43 100644
--- a/src/main/java/run/halo/app/theme/finders/impl/PostFinderImpl.java
+++ b/src/main/java/run/halo/app/theme/finders/impl/PostFinderImpl.java
@@ -127,7 +127,7 @@ public class PostFinderImpl implements PostFinder {
     @Override
     public Flux<ListedPostVo> listAll() {
         return client.list(Post.class, FIXED_PREDICATE, defaultComparator())
-            .flatMap(this::getListedPostVo);
+            .concatMap(this::getListedPostVo);
     }
 
     static Pair<String, String> postPreviousNextPair(List<String> postNames,
@@ -292,7 +292,7 @@ public class PostFinderImpl implements PostFinder {
         return client.list(Post.class, predicate,
                 comparator, pageNullSafe(page), sizeNullSafe(size))
             .flatMap(list -> Flux.fromStream(list.get())
-                .flatMap(post -> getListedPostVo(post)
+                .concatMap(post -> getListedPostVo(post)
                     .map(postVo -> {
                         populateStats(postVo);
                         return postVo;
diff --git a/src/main/java/run/halo/app/theme/finders/impl/SinglePageFinderImpl.java b/src/main/java/run/halo/app/theme/finders/impl/SinglePageFinderImpl.java
index d2b737d98..cac48a350 100644
--- a/src/main/java/run/halo/app/theme/finders/impl/SinglePageFinderImpl.java
+++ b/src/main/java/run/halo/app/theme/finders/impl/SinglePageFinderImpl.java
@@ -96,7 +96,7 @@ public class SinglePageFinderImpl implements SinglePageFinder {
                     populateStats(pageVo);
                     return pageVo;
                 })
-                .flatMap(this::populateContributors)
+                .concatMap(this::populateContributors)
                 .collectList()
                 .map(pageVos -> new ListResult<>(list.getPage(), list.getSize(), list.getTotal(),
                     pageVos)
diff --git a/src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java b/src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java
index 84109a914..d13173ceb 100644
--- a/src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java
+++ b/src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java
@@ -40,7 +40,7 @@ public class TagFinderImpl implements TagFinder {
     @Override
     public Flux<TagVo> getByNames(List<String> names) {
         return Flux.fromIterable(names)
-            .flatMap(this::getByName);
+            .concatMap(this::getByName);
     }
 
     @Override