From cd41447eb8ea56004606e508d00b8cd0e198d3d6 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 19 May 2021 17:52:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=94=E4=BE=8B=E4=BD=93=E7=B3=BB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanySystemRatioController.class.php    | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/Application/Admin/Controller/CompanySystemRatioController.class.php b/Application/Admin/Controller/CompanySystemRatioController.class.php
index c30ac750f..e5102d330 100644
--- a/Application/Admin/Controller/CompanySystemRatioController.class.php
+++ b/Application/Admin/Controller/CompanySystemRatioController.class.php
@@ -44,7 +44,7 @@ class CompanySystemRatioController extends AdminController
         $handleData = $this->getCpGameRatio($handleData);
         $data = $this->handleRatio($handleData);
 
-//        dump($handleData);die();
+//        dump($data);die();
 
         $gameData = M("game","tab_")->field("original_package_name,relation_game_name game_name,game_type_name,relation_game_id game_id")
             ->where($map)
@@ -202,8 +202,8 @@ class CompanySystemRatioController extends AdminController
                         if ($finalData[$key][$v['turnover']]["instanceof"] != $v["instanceof"]) {
                             $finalData[$key][$v['turnover']]["instanceof"] = 0;
 
-                            $finalData[$key][$v['turnover']."eq"] = $finalData[$key][$v['turnover']];
-                            $finalData[$key][$v['turnover']."eq"]['is_equal'] = 1;
+                            $finalData[$key][$v['turnover']."ed"] = $finalData[$key][$v['turnover']];
+                            $finalData[$key][$v['turnover']."ed"]['is_equal'] = 1;
                         }
 
                         continue;
@@ -217,7 +217,14 @@ class CompanySystemRatioController extends AdminController
             }
         }
 
+        foreach ($finalData as $key => $value) {
+
+            $last_names = array_column($finalData[$key],'turnover');
+            array_multisort($last_names,SORT_ASC,$finalData[$key]);
+
+        }
 
+//        dump($finalData);
         $data = [];
         foreach ($finalData as $key => $value) {
 
@@ -240,13 +247,14 @@ class CompanySystemRatioController extends AdminController
             }
 
         }
+//        dump($data);die();
 
-        foreach ($data as $key => $value) {
-
-            $last_names = array_column($data[$key],'turnover');
-            array_multisort($last_names,SORT_ASC,$data[$key]);
-
-        }
+//        foreach ($data as $key => $value) {
+//
+//            $last_names = array_column($data[$key],'turnover');
+//            array_multisort($last_names,SORT_ASC,$data[$key]);
+//
+//        }
 //        dump($data);