From dbe5ed8ef8cfd4e3db3de621215f998f92284e5a Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Mon, 5 Dec 2022 16:05:10 +0800
Subject: [PATCH] 1

---
 .../EventRankingController.class.php          | 42 ++++++++-----------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/webapp/controller/EventRankingController.class.php b/webapp/controller/EventRankingController.class.php
index 063a3b06..f9135e3f 100644
--- a/webapp/controller/EventRankingController.class.php
+++ b/webapp/controller/EventRankingController.class.php
@@ -65,6 +65,8 @@ class EventRankingController extends BaseAuthedController
                         ':type' => $type
                     )
                 );
+
+                $this->myRanked['value'] = $this->getMyValue($wave,$type);
                 $data = $this->paginate($rows,$page,$size);
                 $pages = $data['pages'];
                 $rankingList = $data['lists'];
@@ -80,6 +82,7 @@ class EventRankingController extends BaseAuthedController
                         ':type' => $type
                     )
                 );
+                $this->myRanked['value'] = $this->getMyValue($wave,$type);
                 $ranked = 0;
                 foreach ($rows as $row) {
                     $ranked += 1;
@@ -89,18 +92,6 @@ class EventRankingController extends BaseAuthedController
                         $this->myRanked['rewardNum'] = $this->celAward($wave,$type,$ranked)['rewardNum'];
                         $this->myRanked['extraRewardNum'] = $this->celAward($wave,$type,$ranked)['extraRewardNum'];
                         $this->myRanked['modifytime'] = $row['modifytime'];
-                    }else{
-                        $value = myself()->_getSelfMysql()->execQuery(
-                            'SELECT * FROM t_rank_activity ' .
-                            'WHERE wave=:wave AND type=:type account_id=:account_id' .
-                            "LIMIT 1",
-                            array(
-                                ':wave' => $wave,
-                                ':type' => $type,
-                                ':account_id' => myself()->_getAccountId()
-                            )
-                        );
-                        $this->myRanked['value'] =$value?$value[0]['value']:0;
                     }
                     array_push($rankingList, array(
                         'ranked' => $ranked,
@@ -123,6 +114,7 @@ class EventRankingController extends BaseAuthedController
                         ':type' => $type
                     )
                 );
+                $this->myRanked['value'] = $this->getMyValue($wave,$type);
                 $data = $this->paginate($rows,$page,$size);
                 $pages = $data['pages'];
                 $rankingList = $data['lists'];
@@ -213,18 +205,6 @@ class EventRankingController extends BaseAuthedController
                 $this->myRanked['rewardNum'] = $this->celAward($row['wave'],$row['type'],$ranked)['rewardNum'];
                 $this->myRanked['extraRewardNum'] = $this->celAward($row['wave'],$row['type'],$ranked)['extraRewardNum'];
                 $this->myRanked['modifytime'] = $row['modifytime'];
-            }else{
-                $value = myself()->_getSelfMysql()->execQuery(
-                    'SELECT * FROM t_rank_activity ' .
-                    'WHERE wave=:wave AND type=:type account_id=:account_id' .
-                    "LIMIT 1",
-                    array(
-                        ':wave' => $row['wave'],
-                        ':type' => $row['type'],
-                        ':account_id' => myself()->_getAccountId()
-                    )
-                );
-                $this->myRanked['value'] =$value?$value[0]['value']:0;
             }
             if ($offset<$ranked && $ranked<=$offset+$size){
                 array_push($rankingList, array(
@@ -243,6 +223,20 @@ class EventRankingController extends BaseAuthedController
         );
     }
 
+    private function getMyValue($wave,$type){
+        $value = myself()->_getSelfMysql()->execQuery(
+            'SELECT * FROM t_rank_activity ' .
+            'WHERE wave=:wave AND type=:type AND account_id=:account_id ' .
+            "LIMIT 1",
+            array(
+                ':wave' => $wave,
+                ':type' => $type,
+                ':account_id' => myself()->_getAccountId()
+            )
+        );
+        return $value ? $value[0]['value'] : 0;
+    }
+
     private function celAward($wave,$type,$ranked){
         $rankingMeta = \mt\EventRanking::findByWaveOrType($wave,$type);
         $rewardNum = 0;