diff --git a/Application/Admin/View/BehaviorLog/singleSupplement.html b/Application/Admin/View/BehaviorLog/singleSupplement.html
index 525c0a5ae..ab2778f69 100644
--- a/Application/Admin/View/BehaviorLog/singleSupplement.html
+++ b/Application/Admin/View/BehaviorLog/singleSupplement.html
@@ -108,7 +108,7 @@
- aOh! 暂时还没有内容! |
+ aOh! 暂时还没有内容! |
diff --git a/Application/Admin/View/BindRechargeRecord/lists.html b/Application/Admin/View/BindRechargeRecord/lists.html
index fe66dfd30..f819b7b90 100644
--- a/Application/Admin/View/BindRechargeRecord/lists.html
+++ b/Application/Admin/View/BindRechargeRecord/lists.html
@@ -114,7 +114,7 @@
- aOh! 暂时还没有内容! |
+ aOh! 暂时还没有内容! |
diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html
index 51262e4a4..eb155b224 100644
--- a/Application/Admin/View/Deposit/lists.html
+++ b/Application/Admin/View/Deposit/lists.html
@@ -139,7 +139,7 @@
- aOh! 暂时还没有内容! |
+ aOh! 暂时还没有内容! |
diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html
index ea1f7e6f7..438a93554 100644
--- a/Application/Admin/View/Spend/lists.html
+++ b/Application/Admin/View/Spend/lists.html
@@ -170,7 +170,7 @@
- aOh! 暂时还没有内容! |
+ aOh! 暂时还没有内容! |
diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index 4d33be971..65c0f5a02 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/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;
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 14fe4dc0c..bbb9af98e 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/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'].''.'['.'自己'.']'.'';
+ }else {
+ $listData[$key]['account'] = $promote['account'];
+ }
$tfMap['promote_id'] = $id;
$tfMap['type'] = 2;
$companyMap['promote_id'] = $id;