From 0695a22472c862dcd1a04ce4b175568c7d6e5688 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Wed, 18 Dec 2019 19:26:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ExportController.class.php       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 4d7d08be7..ef08f7fd0 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -5326,7 +5326,8 @@ if ($key == 'model'){
         if(isset($_REQUEST['status'])){
             $map['status']=$_REQUEST['status'];
         }
-
+                //为数据权限添加
+                setPowerPromoteIds($map);
 			} else {
 
 				$xlsCell = array(
@@ -5386,7 +5387,8 @@ if ($key == 'model'){
                 if (I('status')) {
                     $map['tab_promote.status'] = I('status');
                 }
-
+                //为数据权限添加
+                setPowerPromoteIds($map, 'tab_promote.id');
 
             }
 
@@ -5400,8 +5402,7 @@ if ($key == 'model'){
 
 
 
-            //为数据权限添加
-            setPowerPromoteIds($map, 'id');
+
 			$xlsData = [];
 
 //			if(is_array($data)){
@@ -6336,7 +6337,7 @@ if ($key == 'model'){
         unset($map['promote_id']);
 
         //为数据权限添加
-        setPowerPromoteIds($map);
+        setPowerPromoteIds($map, 'tab_spend.promote_id');
 
         $csvFileName = $xlsName . '.csv';
         //设置好告诉浏览器要下载excel文件的headers