From ee1f99ac8a90f4c95e02c8be0551dab4b1697c8c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 31 十二月 2024 15:58:40 +0800
Subject: [PATCH] 10350 【后端】【越南】【英文】【BT】【砍树】跨服竞技场优化（优化查询跨服榜分组排序展示）

---
 GMToolClient/GMTManage/GMT_QueryBillboardCross.php |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/GMToolClient/GMTManage/GMT_QueryBillboardCross.php b/GMToolClient/GMTManage/GMT_QueryBillboardCross.php
index d50267a..5eb8475 100644
--- a/GMToolClient/GMTManage/GMT_QueryBillboardCross.php
+++ b/GMToolClient/GMTManage/GMT_QueryBillboardCross.php
@@ -62,13 +62,25 @@
 $retCount = count($resultList);
 
 $cmpValue3CalcTime = 3786883200; //2090-01-01 00:00:00 鐨勬椂闂存埑锛岀敤浜庡瓨姣旇緝鍊�3鏇存柊鏃堕棿鐨勮绠楀��
+
+function cmp($a, $b)
+{
+	if ($a[1] == $b[1]) {
+		if ($a[2] == $b[2]) {
+			return 0;
+		}
+		return ($a[2] < $b[2]) ? -1 : 1;
+	}
+	return ($a[1] < $b[1]) ? -1 : 1;
+}
+usort($groupList, 'cmp');
 ?>
 
 <br />
 <hr />
 
-<a href="/GMToolClient/queryBillboardCross.php"><?php echo \Lang\gettext("鏌ヨ璺ㄦ湇鎺掕姒�"); ?></a> 
-<br/><br/>
+<a href="/GMToolClient/queryBillboardCross.php"><?php echo \Lang\gettext("鏌ヨ璺ㄦ湇鎺掕姒�"); ?></a>
+<br /><br />
 
 <?php
 
@@ -87,6 +99,10 @@
 		$groupInfo = $groupList[$i];
 		$groupV1 = $groupInfo[1];
 		$groupV2 = $groupInfo[2];
+		$dataCount = $dataTotalDict[$bbType . "-" . $groupV1 . "-" . $groupV2];
+		if ($dataCount <= 0) {
+			continue;
+		}
 		// if ($groupV1 == $groupValue1 and $groupV2 == $groupValue2) {
 		// 	continue;
 		// }
@@ -100,7 +116,7 @@
 				\"startRank\":$startRank,
 				\"queryCount\":$queryCount,
 			})'>"
-			. $bbType . "-" . $groupV1 . "-" . $groupV2 . "</a> 鎬绘潯鏁�:" . $dataTotalDict[$bbType . "-" . $groupV1 . "-" . $groupV2] ."<br/>";
+			. $bbType . "-" . $groupV1 . "-" . $groupV2 . "</a> 鎬绘潯鏁�:" . $dataCount . "<br/>";
 	}
 }
 
@@ -110,7 +126,7 @@
 	echo "<br/>";
 	echo \Lang\gettext("鏌ヨ鍒嗙粍") . ": " . $bbType . "-" . $groupValue1 . "-" . $groupValue2;
 	echo "&nbsp;&nbsp;&nbsp;&nbsp;";
-	echo \Lang\gettext("鏁版嵁鏉℃暟") . ": " . $retCount . " / ". $dataTotal ."<br/>";
+	echo \Lang\gettext("鏁版嵁鏉℃暟") . ": " . $retCount . " / " . $dataTotal . "<br/>";
 	echo "<table id=\"tf\" class=\"border-table\">";
 	echo "<tr>";
 	foreach ($billboardKeyCh as $key => $value) {
@@ -130,7 +146,7 @@
 	for ($i = 0; $i < $retCount; $i++) {
 		$dataInfo = $resultList[$i];
 		echo "<tr>";
-		echo "<td align='center'>" . ($dataInfo["Index"]?$dataInfo["Index"]:0) . "</td>";
+		echo "<td align='center'>" . ($dataInfo["Index"] ? $dataInfo["Index"] : 0) . "</td>";
 
 		foreach ($billboardKeyCh as $key => $value) {
 			if ($key == "Index") {

--
Gitblit v1.8.0