From 3f45e8fdfa31d7b764d60a7c0cb5dd11944ed418 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 23:38:59 +0800
Subject: [PATCH] bug：统计数据修正
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java
index 3e92f2d..da57327 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java
@@ -168,7 +168,19 @@
tHuiminCard.setObjectType(objectType);
Integer objectId = user.getObjectId();
tHuiminCard.setObjectId(objectId);
- return super.packForBT(huiminCardClient.queryPage(tHuiminCard));
+ Page<THuiminCard> page = huiminCardClient.queryPage(tHuiminCard);
+ page.getRecords().sort(Comparator
+ .comparing((THuiminCard card) -> parseSort(card.getSort()), Comparator.nullsLast(Comparator.reverseOrder()))
+ .thenComparing(THuiminCard::getId, Comparator.nullsLast(Comparator.reverseOrder())));
+ return super.packForBT(page);
+ }
+
+ private Long parseSort(String sort) {
+ try {
+ return sort == null ? null : Long.valueOf(sort);
+ } catch (NumberFormatException ignored) {
+ return null;
+ }
}
/**
@@ -254,6 +266,7 @@
.eq(!StringUtils.isEmpty(query.getProvinceCode()), TSite::getProvinceCode, query.getProvinceCode())
.eq(operatorId != null, TSite::getOperatorId, operatorId)
.ne(TSite::getState,3)
+ .orderByDesc(TSite::getId)
.eq(TSite::getSign,0)
.eq(!StringUtils.isEmpty(query.getCityCode()), TSite::getCityCode, query.getCityCode())
.in(!storeIds.isEmpty(), TSite::getStoreId, storeIds));
--
Gitblit v1.7.1