irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

feat: 線上優先排序並更新測試

Browse Source
This commit is contained in:
irving
2025-11-14 10:31:16 -05:00
parent 5331fd75a2
commit e10b7bd3be
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
View File

@@ -328,8 +328,8 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
// 排序：非空的等级排序号优先，值越小越靠前；同一排序号在线状态优先 // 排序：非空的等级排序号优先，值越小越靠前；同一排序号在线状态优先
lambdaQueryWrapper lambdaQueryWrapper
.orderByDesc(PlayClerkUserInfoEntity::getPinToTopState)
.orderByDesc(PlayClerkUserInfoEntity::getOnlineState) .orderByDesc(PlayClerkUserInfoEntity::getOnlineState)
.orderByDesc(PlayClerkUserInfoEntity::getPinToTopState)
.orderByAsc(true, "CASE WHEN t1.order_number IS NULL THEN 1 ELSE 0 END") .orderByAsc(true, "CASE WHEN t1.order_number IS NULL THEN 1 ELSE 0 END")
.orderByAsc(PlayClerkLevelInfoEntity::getOrderNumber) .orderByAsc(PlayClerkLevelInfoEntity::getOrderNumber)
.orderByAsc(PlayClerkUserInfoEntity::getCreatedTime) .orderByAsc(PlayClerkUserInfoEntity::getCreatedTime)

10
play-admin/src/test/java/com/starry/admin/api/PlayClerkUserInfoApiTest.java
View File

@@ -352,14 +352,14 @@ class PlayClerkUserInfoApiTest extends AbstractApiTest {
} }
assertThat(orderedIds.indexOf(pinnedOnline)) assertThat(orderedIds.indexOf(pinnedOnline))
.isLessThan(orderedIds.indexOf(pinnedOffline));
assertThat(orderedIds.indexOf(pinnedOffline))
.isLessThan(orderedIds.indexOf(online1)); .isLessThan(orderedIds.indexOf(online1));
assertThat(orderedIds.indexOf(online1)) assertThat(orderedIds.indexOf(online1))
.isLessThan(orderedIds.indexOf(offline)); .withFailMessage("Online entries should stay ahead, list=%s", orderedIds)
assertThat(orderedIds.indexOf(online1))
.withFailMessage("Created time fallback should maintain order, list=%s", orderedIds)
.isLessThan(orderedIds.indexOf(online2)); .isLessThan(orderedIds.indexOf(online2));
assertThat(orderedIds.indexOf(online2))
.isLessThan(orderedIds.indexOf(pinnedOffline));
assertThat(orderedIds.indexOf(pinnedOffline))
.isLessThan(orderedIds.indexOf(offline));
} }