From 47f53a49411393834060033e76c869543f00bb6c Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Wed, 18 Dec 2019 14:23:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0-=E3=80=8B?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=BB=9F=E8=AE=A1-=E3=80=8B=E6=B8=B8?=
 =?UTF-8?q?=E6=88=8F=E6=B3=A8=E5=86=8C=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E4=B8=8E=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=20=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0-?=
 =?UTF-8?q?=E3=80=8B=E5=B9=B3=E5=8F=B0=E7=BB=9F=E8=AE=A1-=E3=80=8B?=
 =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E4=B8=8E=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=9D=83=E9=99=90=20=E7=AE=A1=E7=90=86=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0-=E3=80=8B=E5=B9=B3=E5=8F=B0=E7=BB=9F=E8=AE=A1-?=
 =?UTF-8?q?=E3=80=8B=E6=B3=A8=E5=86=8C=E6=96=B9=E5=BC=8F=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E4=B8=8E?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9D=83=E9=99=90=20=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E3=80=8B=E5=B9=B3=E5=8F=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1-=E3=80=8B=E5=85=85=E5=80=BC=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=B8=8E=E5=AF=BC=E5=87=BA=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ExportController.class.php     |  8 ++++++++
 .../Admin/Controller/PlatformController.class.php   | 13 ++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index a19c16544..1b91e0c76 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -2144,6 +2144,8 @@ class ExportController extends Controller
         $today=total(1);
         $week=total(2);
         $mounth=total(3);
+        //为数据权限添加
+        setPowerPromoteIds($map);
         $data=$user
             ->field('fgame_name,fgame_id,date_format(FROM_UNIXTIME( register_time),"%Y-%m-%d") AS time, count(id) as count,
 			    count(IF(register_time '.$today.',1,null)) as today,
@@ -2222,6 +2224,8 @@ class ExportController extends Controller
         $today=total(1);
         $week=total(2);
         $mounth=total(3);
+        //为数据权限添加
+        setPowerPromoteIds($map);
         $data=$spend
             ->field('game_name,game_id,date_format(FROM_UNIXTIME(pay_time),"%Y-%m-%d") AS time, sum(pay_amount) as count,
 			    sum(IF(pay_time '.$today.',pay_amount,0)) as today,
@@ -2298,6 +2302,8 @@ class ExportController extends Controller
         $today=total(1);
         $week=total(2);
         $mounth=total(3);
+        //为数据权限添加
+        setPowerPromoteIds($map);
         $data=$user
             ->field('register_way,date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, count(id) as count,
 			    count(IF(register_time '.$today.',1,null)) as today,
@@ -2370,6 +2376,8 @@ class ExportController extends Controller
         $today=total(1);
         $week=total(2);
         $mounth=total(3);
+        //为数据权限添加
+        setPowerPromoteIds($map);
         $data=$spend
             ->field('pay_way,date_format(FROM_UNIXTIME(pay_time),"%Y-%m-%d") AS time, sum(pay_amount) as count,
 			    sum(IF(pay_time '.$today.',pay_amount,0)) as today,
diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php
index ed9f14de5..888c8dc7c 100644
--- a/Application/Admin/Controller/PlatformController.class.php
+++ b/Application/Admin/Controller/PlatformController.class.php
@@ -44,11 +44,8 @@ class PlatformController extends ThinkController
             $map['fgame_name'] = $_REQUEST['game_name'];
             unset($_REQUEST['fgame_name']);
         }
-
-        $promoteRoot = getPowerPromoteIds();
-        if ($promoteRoot) {
-            $map['promote_id'] =array('in',$promoteRoot);
-        }
+        //为数据权限添加
+        setPowerPromoteIds($map);
 
         $today = total(1);
         $week = total(2);
@@ -126,10 +123,8 @@ class PlatformController extends ThinkController
             unset($_REQUEST['timeend']);
         }
 
-        $promoteRoot = getPowerPromoteIds();
-        if ($promoteRoot) {
-            $map['promote_id'] =array('in',$promoteRoot);
-        }
+        //为数据权限添加
+        setPowerPromoteIds($map);
 
         // var_dump($_REQUEST);exit;
         if (isset($_REQUEST['game_name']) && $_REQUEST['game_name'] != '') {