From 9c11344906f4d6c4559ec38921899130b2aade7e Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 28 Aug 2020 20:34:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8=E6=8E=A8?=
 =?UTF-8?q?=E5=B9=BF=E5=85=AC=E5=8F=B8=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/PromoteCompanyController.class.php      | 5 ++---
 Application/Admin/View/PromoteCompany/export.html            | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index 9f94b9c09..093749cc9 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -188,7 +188,7 @@ class PromoteCompanyController extends ThinkController
         $promotemap['p.company_id']=["in",$companyallids];
         $promotemap['p.level']=1;
         $promotecount = M("Promote","tab_")->alias('p')->where($promotemap)->count();
-//         dd($companyres);
+        // dd($companyres);
         $this->assign('listData', $companyres);
         $this->assign('count', $count);
         $this->assign('promotecount', $promotecount);
@@ -1300,7 +1300,7 @@ class PromoteCompanyController extends ThinkController
             if($is_export){
                 $CpRadio = $this->getPromoteCompanyCpRadio($game_ids);
             }
-
+            // dd($CpRadio);
             $endtime = time();
             $rwhere = "(end_time = 0 OR end_time >= '{$endtime}') and company_id='{$company_id}' and relation_game_id in ({$game_ids})";
             $cgr_res = M("CompanyGameRatio","tab_")->where($rwhere)->select();
@@ -1334,7 +1334,6 @@ class PromoteCompanyController extends ThinkController
                     }
                 }
             }
-            
             if(empty($game_arr)){
                 return $senddata;
             }
diff --git a/Application/Admin/View/PromoteCompany/export.html b/Application/Admin/View/PromoteCompany/export.html
index ec4baf16e..6009de6b8 100644
--- a/Application/Admin/View/PromoteCompany/export.html
+++ b/Application/Admin/View/PromoteCompany/export.html
@@ -209,8 +209,8 @@
                                         <td>{$p_ratio['turnover_ratio'][0]['name']|default="--"}</td>
                                         <td>{$p_ratio['turnover_ratio'][0]['ratio']|showPercent}</td>
 
-                                        <td>{$p_ratio['cp_ratio'][$gamekey]['name']|default="--"}</td>
-                                        <td>{$p_ratio['cp_ratio'][$gamekey]['ratio']|showPercent}</td>
+                                        <td>{$p_ratio['cp_ratio'][0]['name']|default="--"}</td>
+                                        <td>{$p_ratio['cp_ratio'][0]['ratio']|showPercent}</td>
                                     <else />
                                         <td >-</td>
                                         <td>-</td>