From 38c64f54303d3829f5c4ae7553c6cc815a36998b Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Wed, 15 Jan 2020 14:14:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0-=E3=80=8B?=
 =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E5=88=97=E8=A1=A8=E5=8F=AF=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E5=86=85=E5=A4=96=E5=9B=A2=E6=90=9C=E7=B4=A2?=
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/PromoteController.class.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 911f4ec86..118624446 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -5884,6 +5884,9 @@ class ExportController extends Controller
             if (I('status')) {
                 $map['tab_promote.status'] = I('status');
             }
+            if (strlen(I('company_belong'))) {
+                $map['company_belong'] = I("company_belong");
+            }
             //为数据权限添加
             setPowerPromoteIds($map, 'tab_promote.id');
 
diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index 140630b6e..70f8984c6 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -96,6 +96,9 @@ class PromoteController extends ThinkController
         if (I("promote_level")) {
             $map['level'] = I("promote_level");
         }
+        if (strlen(I('company_belong'))) {
+            $map['company_belong'] = I("company_belong");
+        }
         $this->m_title = '推广员列表';
         $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/lists/type/1','status'=>1])->find());
         if (isset($_REQUEST['row'])) {