From a9c2207ba2858df0870970ce164338aac76dc3b7 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Fri, 20 Dec 2019 09:30:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/BehaviorLogController.class.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 071a1e19f..5720a6f55 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -58,8 +58,13 @@ class BehaviorLogController extends ThinkController if(empty($v['extend'])) { $data[$k]['extend'] = $v['order_id']; } - if ($v['server_id'] > 0){ + if ($v['server_id'] > 0 && !empty($v['extend'])){ $data[$k]['server_name'] = M('server', 'tab_')->where(['game_id' => $v['game_id'],'server_num' =>$v['server_id']])->getField('server_name'); + } else { + $data[$k]['server_name'] = ''; + $data[$k]['game_player_name'] = ''; + $data[$k]['game_player_id'] = ''; + } } $count = M('pay_info', 'tab_')->where($map)->count(); From ba59b41fb91d6f7b9c55c1b19dbcda86bf5d8a68 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 20 Dec 2019 10:07:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=AE=98=E6=96=B9=E6=B8=A0=E9=81=93=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Model/PromoteModel.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Model/PromoteModel.class.php b/Application/Admin/Model/PromoteModel.class.php index 4256f3f97..b466da9a2 100644 --- a/Application/Admin/Model/PromoteModel.class.php +++ b/Application/Admin/Model/PromoteModel.class.php @@ -390,6 +390,7 @@ class PromoteModel extends Model{ { $where['level'] = $level; + $userAuth = session('user_auth'); setPowerPromoteIds($where,'id'); $offcialData = [0=>['id'=>0,'nickname'=>'官方渠道']]; @@ -399,7 +400,7 @@ class PromoteModel extends Model{ $item['nickname'] = $item['account'] . ($item['nickname'] ? "({$item['nickname']})" : ""); } - if (in_array('0',explode(',',$where['id'][1]))) { + if (in_array('0',explode(',',$where['id'][1]))||$userAuth['data_empower_type']==1) { $result = array_merge($offcialData,$result); // dump($result);die(); }