From 3b23c0c5cf86e3377e92876c347ec0903feab3b6 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Fri, 20 Dec 2019 16:24:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86-=E3=80=8B?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E3=80=8B=E6=8E=A8=E5=B9=BF=E5=91=98?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89=E5=AE=98=E6=96=B9=E6=B8=A0=E9=81=93?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ExportController.class.php   | 3 ++-
 Application/Admin/Controller/PlatformController.class.php | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 7d104feaa..fe36f71ab 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -2561,7 +2561,8 @@ class ExportController extends Controller
         unset($map['tp1.chain']);
         $map['promote_id'] = 0;
         //如果有官方渠道权限
-        if (in_array('0', explode(",", session('user_auth_promote_ids')))) {
+        $user_auth_promote_ids = session('user_auth_promote_ids');
+        if ($user_auth_promote_ids == 'all' || in_array('0', explode(",", $user_auth_promote_ids))) {
             //官方渠道数据添加
             $authorityData = M('user', 'tab_')->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, 
             count(id) as count,		
diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php
index 2bc2b1867..8c2cc9281 100644
--- a/Application/Admin/Controller/PlatformController.class.php
+++ b/Application/Admin/Controller/PlatformController.class.php
@@ -414,8 +414,10 @@ class PlatformController extends ThinkController
         unset($map['tp1.chain']);
         $map['promote_id'] = 0;
         $authorityData['count'] = 0;
+
         //如果有官方渠道权限
-        if (in_array('0', explode(",", session('user_auth_promote_ids')))) {
+        $user_auth_promote_ids = session('user_auth_promote_ids');
+        if ($user_auth_promote_ids == 'all' || in_array('0', explode(",", $user_auth_promote_ids))) {
             //官方渠道数据添加
             $authorityData = M('user', 'tab_')->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, 
             count(id) as count,