From 47e57f48e66310b830fa831d0c612bfc214d6e77 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 4 Aug 2020 14:57:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9=E6=96=87?= =?UTF-8?q?=E5=AD=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementSetController.class.php | 2 +- .../Admin/Controller/PromoteCompanyController.class.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index a0f1818de..a3720268f 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -767,7 +767,7 @@ class CompanyStatementSetController extends Controller { $spenMap['s.promote_id']=["in",$pres['ids']]; //获取支付记录 $list = $Spend->alias('s')->field('sum(s.pay_amount) pay_amount,s.game_id,g.relation_game_id,g.relation_game_name game_name')->where($spenMap)->group('game_id') - ->join("tab_game g on s.game_id = g.id") + ->join("left join tab_game g on s.game_id = g.id") ->select(); if(empty($list)){continue;} foreach($list as $k=>$v){ diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index ccfc01f04..8f7eac955 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -267,7 +267,7 @@ class PromoteCompanyController extends ThinkController $v['verify_log'] = json_decode($v['verify_log'], true); $v["create"]= "{$v['verify_log']['create_user']}
{$v['verify_log']['create_time']}"; if(isset($v['verify_log']['market_user'])){ - if($v['status'] == -1){ + if($v['verify_status'] == -1){ $ts = "审核拒绝"; }else{ $ts = "审核通过"; @@ -278,7 +278,7 @@ class PromoteCompanyController extends ThinkController } if(isset($v['verify_log']['admin_user'])){ - if($v['status'] == -2){ + if($v['verify_status'] == -2){ $ts = "审核拒绝"; }else{ $ts = "审核通过";