From 024ee7ebdada6138cd75c280c51c4868c75d703a Mon Sep 17 00:00:00 2001
From: irving <oujunyiirving@gmail.com>
Date: Tue, 4 Nov 2025 22:16:42 -0500
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=BA=97=E5=91=98?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E4=BB=A5=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../clerk/module/entity/PlayClerkLevelInfoEntity.java        | 3 +++
 .../clerk/service/impl/PlayClerkUserInfoServiceImpl.java     | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkLevelInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkLevelInfoEntity.java
index 4f38610..f3b42d0 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkLevelInfoEntity.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkLevelInfoEntity.java
@@ -1,5 +1,7 @@
 package com.starry.admin.modules.clerk.module.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.starry.common.domain.BaseEntity;
 import lombok.Data;
@@ -70,5 +72,6 @@ public class PlayClerkLevelInfoEntity extends BaseEntity<PlayClerkLevelInfoEntit
 
     private String styleImageUrl;
 
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long orderNumber;
 }
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 a5e5f49..c8adafe 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
@@ -344,8 +344,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
             lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getOnboardingState, vo.getOnboardingState());
         }
 
-        // 排序：先按等级字段排序(越小的越在前面)，再按在线状态排序
-        lambdaQueryWrapper.orderByAsc(PlayClerkLevelInfoEntity::getOrderNumber)
+        // 排序：非空的等级排序号优先，值越小越靠前；同一排序号在线状态优先
+        lambdaQueryWrapper.orderByAsc(true, "CASE WHEN t1.order_number IS NULL THEN 1 ELSE 0 END")
+                          .orderByAsc(PlayClerkLevelInfoEntity::getOrderNumber)
                           .orderByDesc(PlayClerkUserInfoEntity::getOnlineState);
 
         return this.baseMapper.selectJoinPage(page, PlayClerkUserInfoResultVo.class, lambdaQueryWrapper);