From e10b7bd3be918f7559ee8e3a8ade62a4cfa940da Mon Sep 17 00:00:00 2001
From: irving <oujunyiirving@gmail.com>
Date: Fri, 14 Nov 2025 10:31:16 -0500
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=B7=9A=E4=B8=8A=E5=84=AA=E5=85=88?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=B8=A6=E6=9B=B4=E6=96=B0=E6=B8=AC=E8=A9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PlayClerkUserInfoServiceImpl.java     |  2 +-
 .../com/starry/admin/api/PlayClerkUserInfoApiTest.java | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
index 1b28823..9620a2a 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
@@ -328,8 +328,8 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
 
         // 排序：非空的等级排序号优先，值越小越靠前；同一排序号在线状态优先
         lambdaQueryWrapper
-                .orderByDesc(PlayClerkUserInfoEntity::getPinToTopState)
                 .orderByDesc(PlayClerkUserInfoEntity::getOnlineState)
+                .orderByDesc(PlayClerkUserInfoEntity::getPinToTopState)
                 .orderByAsc(true, "CASE WHEN t1.order_number IS NULL THEN 1 ELSE 0 END")
                 .orderByAsc(PlayClerkLevelInfoEntity::getOrderNumber)
                 .orderByAsc(PlayClerkUserInfoEntity::getCreatedTime)
diff --git a/play-admin/src/test/java/com/starry/admin/api/PlayClerkUserInfoApiTest.java b/play-admin/src/test/java/com/starry/admin/api/PlayClerkUserInfoApiTest.java
index b9a0b22..d9e17d6 100644
--- a/play-admin/src/test/java/com/starry/admin/api/PlayClerkUserInfoApiTest.java
+++ b/play-admin/src/test/java/com/starry/admin/api/PlayClerkUserInfoApiTest.java
@@ -352,14 +352,14 @@ class PlayClerkUserInfoApiTest extends AbstractApiTest {
         }
 
         assertThat(orderedIds.indexOf(pinnedOnline))
-                .isLessThan(orderedIds.indexOf(pinnedOffline));
-        assertThat(orderedIds.indexOf(pinnedOffline))
                 .isLessThan(orderedIds.indexOf(online1));
         assertThat(orderedIds.indexOf(online1))
-                .isLessThan(orderedIds.indexOf(offline));
-        assertThat(orderedIds.indexOf(online1))
-                .withFailMessage("Created time fallback should maintain order, list=%s", orderedIds)
+                .withFailMessage("Online entries should stay ahead, list=%s", orderedIds)
                 .isLessThan(orderedIds.indexOf(online2));
+        assertThat(orderedIds.indexOf(online2))
+                .isLessThan(orderedIds.indexOf(pinnedOffline));
+        assertThat(orderedIds.indexOf(pinnedOffline))
+                .isLessThan(orderedIds.indexOf(offline));
     }