ios

Application/Admin/Controller/ConsoleController.class.php

@@ -373,8 +373,7 @@ class ConsoleController extends Think {
         $deposit = M('deposit', 'tab_')->field('pay_order_number,user_id,user_account,pay_status,pay_way,pay_amount,create_time as pay_time,2 as record_type')->where(['pay_status'=>1])->select(false);
       //  $agent = M('agent', 'tab_')->field('pay_order_number,user_id,user_account,pay_status,pay_way,real_amount as pay_amount,create_time as pay_time,3 as record_type')->where(['pay_status'=>1])->select(false);
       //  $spend = M('spend', 'tab_')->field('pay_order_number,user_id,user_account,pay_status,pay_way,pay_amount,pay_time,1 as record_type')->where(['pay_status' => 1,'pay_way'=>0])->select(false);
-        $query = M('spend', 'tab_')->field('pay_order_number,user_id,user_account,pay_status,pay_way,pay_amount,pay_time,record_type')->where(['pay_status' => 1,'pay_way'=>0])->union($deposit,'pay_time')->select(false);
-
+        $query = M('spend', 'tab_')->field('pay_order_number,user_id,user_account,pay_status,pay_way,pay_amount,pay_time,1 as record_type')->where(['pay_status' => 1,'pay_way'=>0])->union($deposit,'pay_time')->select(false);
         $model = new \Think\Model();
         $datas = $model->table('(' . $query . ') a ')->order('pay_time asc')->select();
         foreach ($datas as $key => $data) {

Application/Home/Controller/QueryController.class.php

@@ -2499,7 +2499,11 @@ class QueryController extends BaseController
         $queryPromote = $this->getQueryPromote($levelPromote);
         $loginPromote = $this->getLoginPromote();
         $map = [];
-        $map['chain'] = ['like', $queryPromote['chain'] . $queryPromote['id'] . '/%'];
+        if ($queryPromote['level'] == 4) {
+            $map['id'] = $queryPromote['id'];
+        }else {
+            $map['chain'] = ['like', $queryPromote['chain'] . $queryPromote['id'] . '/%'];
+        }
         $createTime = I('create_time', '');
         if ($createTime != '') {
             $createTimeRow = explode(' 至 ', $createTime);