Merge branch 'feature/IOSdata' of wmtx/platform into release

修改bug

Application/Admin/View/BehaviorLog/singleSupplement.html

@@ -108,7 +108,7 @@
                 <!-- 列表 -->
                 <tbody>
                 <empty name="show_data">
-                    <td colspan="11" class="text-center">aOh! 暂时还没有内容!</td>
+                    <td colspan="12" class="text-center">aOh! 暂时还没有内容!</td>
                     <else/>
                     <volist name="show_data" id="vo">
                         <tr>

Application/Admin/View/BindRechargeRecord/lists.html

@@ -114,7 +114,7 @@
                 <tbody>
                   <empty name="data.data" >
                 <tr>
-                <td colspan="7" class="text-center"> aOh! 暂时还没有内容! </td>
+                <td colspan="8" class="text-center"> aOh! 暂时还没有内容! </td>
                 </tr>
                 <else />
                     <volist name="data.data" id="vo">

Application/Admin/View/Deposit/lists.html

@@ -139,7 +139,7 @@
                 <!-- 列表 -->
                 <tbody>
                 <empty name ="list_data">
-                    <td colspan="11" class="text-center">aOh! 暂时还没有内容!</td>
+                    <td colspan="12" class="text-center">aOh! 暂时还没有内容!</td>
                     <else />
                     <volist name="list_data" id="data">
                         <tr>

Application/Admin/View/Spend/lists.html

@@ -170,7 +170,7 @@
                 <!-- 列表 -->
                 <tbody>
                 <empty name="list_data">
-                    <td colspan="17" class="text-center">aOh! 暂时还没有内容!</td>
+                    <td colspan="18" class="text-center">aOh! 暂时还没有内容!</td>
                     <else/>
                     <volist name="list_data" id="data">
                         <tr>

Application/Home/Controller/DownloadController.class.php

@@ -2358,6 +2358,7 @@ public function iosDetailExcelInfo($id,$map) {
         }
         $rs = M('promote', 'tab_')->field(['id'])->where($map1)->select();
         $allids = array_column($rs, 'id');
+        array_push($allids, PID);
         $allUserMap['promote_id'] = ['in', $allids];
         $allTFMap['promote_id'] = ['in', $allids]; 
         $allTFMap['type'] = 2;
@@ -2386,12 +2387,20 @@ public function iosDetailExcelInfo($id,$map) {
             $data = M('promote', 'tab_')->field(['id'])->where($map1)
             ->limit(($i-1)*$perSize  ,$perSize)->select();
             $ids = array_column($data, 'id');
+            if ($i == 1) {
+                array_unshift($ids, PID);
+            }
             foreach($ids as $key => $id) {
                 $promote1 = M('promote', 'tab_')->field('account, level, parent_id, chain')->where(['id' => $id])->select();
                 $promote = $promote1[0];
                 $chain = $promote['chain'];
                 //$csvData['promote_id'] = $id;
-                $csvData['account'] = $promote['account'];
+                if($id == PID) {
+                    $csvData['account'] = $promote['account'].'[自己]';
+                }else {
+                    $csvData['account'] = $promote['account'];
+                }
+                
                 $tfMap['promote_id'] = $id;
                 $tfMap['type'] = 2;
                 $companyMap['promote_id'] = $id;

Application/Home/Controller/QueryController.class.php

@@ -2519,10 +2519,15 @@ class QueryController extends BaseController
         $query = M('promote', 'tab_')->field(['id'])->where($map);
         list($promotes, $pagination, $count) = $this->paginate($query);
         $ids = array_column($promotes, 'id');
+        if ($page == 1) {
+            array_push($ids, PID);
+        }
+        // var_dump($ids);die();
         // $ids = M('promote', 'tab_')->where($map)->getField('id', true);
         // $ids[] = $queryPromote['id'];
         $allPromote = M('promote', 'tab_')->field(['id'])->where($map)->select();
         $allids = array_column($allPromote, 'id');
+        array_push($allids, PID);
         $map = [];
         $map['tab_package_download_log.promote_id'] = ['in', $ids];
 
@@ -2545,7 +2550,11 @@ class QueryController extends BaseController
             $promote = $promote1[0];
             $chain = $promote['chain'];
             $listData[$key]['promote_id'] = $id;
-            $listData[$key]['account'] = $promote['account'];
+            if($id == PID) {
+                $listData[$key]['account'] = $promote['account'].'<span style="color:blue;">'.'['.'自己'.']'.'</span>';
+            }else {
+                $listData[$key]['account'] = $promote['account'];
+            }
             $tfMap['promote_id'] = $id;
             $tfMap['type'] = 2;
             $companyMap['promote_id'] = $id;