From 982a7f4c1b1d8f9710477b73eece5ccc669fab54 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 19 May 2020 09:19:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=88=E4=BD=9C?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/PartnerController.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php
index c583e27f2..646731001 100644
--- a/Application/Admin/Controller/PartnerController.class.php
+++ b/Application/Admin/Controller/PartnerController.class.php
@@ -62,7 +62,7 @@ class PartnerController extends ThinkController
         //获取分页数据
         $query = $model->alias('p')
             ->field("p.partner,p.matche_platform,p.invoice_rate,p.settlement_type,p.bank_account,
-            p.opening_bank,p.id,p.contract_start_time,p.contract_end_time,p.remark,p.company_type")
+            p.opening_bank,p.id,p.contract_start_time,p.contract_end_time,p.remark,p.company_type,p.has_game_evidence,p.is_sign_contract")
             ->where($map)
             ->order("id desc");
         if($is_export){
@@ -143,8 +143,8 @@ class PartnerController extends ThinkController
         $parseData = array();
         foreach ($partners as $key =>$value) {
             $value['game'] = $parseGames[$value['id']];
-            $value['has_game_evidence'] = $parseGames['has_game_evidence'] ? '有' : '没有';
-            $value['is_sign_contract'] = $parseGames['is_sign_contract'] ? '是' : '否';
+            $value['has_game_evidence'] = $value['has_game_evidence'] ? '有' : '没有';
+            $value['is_sign_contract'] = $value['is_sign_contract'] ? '是' : '否';
             $value['channel_rate'] *= 100;
             $value['invoice_rate'] *= 100;
             if ($value['settlement_type'] == 0) {

From 9c1a12296d4b2862eeb47cf39ab9cedb66d620ce Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 19 May 2020 09:36:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=88=E4=BD=9C?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/PartnerController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php
index 646731001..d3b151de3 100644
--- a/Application/Admin/Controller/PartnerController.class.php
+++ b/Application/Admin/Controller/PartnerController.class.php
@@ -143,7 +143,7 @@ class PartnerController extends ThinkController
         $parseData = array();
         foreach ($partners as $key =>$value) {
             $value['game'] = $parseGames[$value['id']];
-            $value['has_game_evidence'] = $value['has_game_evidence'] ? '有' : '没有';
+            $value['has_game_evidence'] = $value['has_game_evidence'] ? '是' : '否';
             $value['is_sign_contract'] = $value['is_sign_contract'] ? '是' : '否';
             $value['channel_rate'] *= 100;
             $value['invoice_rate'] *= 100;