From 74f016adb2e1ca62b3bc9f3e0ae794ceac6fa1f0 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Mon, 6 Jan 2020 17:24:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BF=AE=E6=94=B9oa-?= =?UTF-8?q?=E6=8D=A2=E7=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sdk/Controller/FengHuoApi2Controller.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Application/Sdk/Controller/FengHuoApi2Controller.class.php b/Application/Sdk/Controller/FengHuoApi2Controller.class.php index 9101d335..877e2b19 100644 --- a/Application/Sdk/Controller/FengHuoApi2Controller.class.php +++ b/Application/Sdk/Controller/FengHuoApi2Controller.class.php @@ -307,8 +307,7 @@ class FengHuoApi2Controller extends GetInfoBaseController{ $order = 'm.create_time asc'; $data = M('mend as m', 'tab_') ->join('tab_user as u on m.user_id = u.id','LEFT') - ->join('tab_promote as p on m.promote_id_to = p.id','LEFT') - ->field('m.user_id,m.create_time,m.promote_account,m.promote_account_to,m.bind_type,m.user_account,u.register_time,p.company_belong') + ->field('m.user_id,m.create_time,m.promote_account,m.promote_account_to,m.bind_type,m.user_account,u.register_time') ->where($where) ->order($order) ->page($page, $row) @@ -316,12 +315,12 @@ class FengHuoApi2Controller extends GetInfoBaseController{ foreach ($data as $k => $v) { $bindType = $v['bind_type']; - if ($v['company_belong'] == 1 || $bindType == 2) { - $data[$k]['bind_type'] = 'Out'; - } elseif($bindType == 1) { + if ($bindType == 1) { $data[$k]['bind_type'] = 'In'; + }elseif($bindType == 2){ + $data[$k]['bind_type'] = 'Out'; } - unset($data[$k]['company_belong']); + } if ($data) { $result = [ @@ -337,6 +336,7 @@ class FengHuoApi2Controller extends GetInfoBaseController{ } Log::write('bindHistory:' . date('Y-m-d H:i:s') . ' ---- ' . json_encode($result), 'INFO'); + return $this->ajaxReturn($result); } } \ No newline at end of file