From 93715d3ba651f1fc3dd9d895fd7b3852ce0730ab Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 14 May 2022 14:23:19 +0800
Subject: [PATCH] 1

---
 doc/Ranking.py                                | 1 +
 webapp/controller/RankingController.class.php | 8 ++++----
 webapp/services/RankActivityService.php       | 4 ++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/doc/Ranking.py b/doc/Ranking.py
index 75980f71..90b2b759 100644
--- a/doc/Ranking.py
+++ b/doc/Ranking.py
@@ -27,6 +27,7 @@ class Ranking(object):
                 'url': 'webapp/index.php?c=Ranking&a=activityRankingList',
                 'params': [
                     _common.ReqHead(),
+                    ['type', 0, '排行榜类型 1:生存榜 2:击杀榜 3:英雄升级 4:英雄升阶']
                 ],
                 'response': [
                     _common.RspHead(),
diff --git a/webapp/controller/RankingController.class.php b/webapp/controller/RankingController.class.php
index dc7fdcde..e9969b43 100644
--- a/webapp/controller/RankingController.class.php
+++ b/webapp/controller/RankingController.class.php
@@ -76,10 +76,10 @@ class RankingController extends BaseAuthedController {
 
     public function activityRankingList()
     {
-        $rankingList = $this->internalGetActivityRankData(1);
-        $this->_rspData(array(
-            'ranking_list' =>$rankingList
-        ));
+        $rankingData = $this->internalGetActivityRankData(getReqVal('type', 0));
+        $this->_rspData(
+            $rankingData
+        );
     }
 
     private function internalGetActivityRankData($type)
diff --git a/webapp/services/RankActivityService.php b/webapp/services/RankActivityService.php
index 2ef5da28..770dfe0f 100644
--- a/webapp/services/RankActivityService.php
+++ b/webapp/services/RankActivityService.php
@@ -73,6 +73,10 @@ class RankActivityService extends BaseService {
             return;
         }
 
+        if ($val > $meta['limit']) {
+            $val = $meta['limit'];
+        }
+
         SqlHelper::upsert
             (myself()->_getSelfMysql(),
              't_rank_activity',