From a9959e9544bbec4cca537dd1897906355bdde402 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 19 Dec 2019 21:28:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8E=A8=E5=B9=BF=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=90=9C=E7=B4=A2=E5=BA=95=E4=B8=8B=E6=8E=A8?=
 =?UTF-8?q?=E5=B9=BF=E5=91=98=E6=97=B6=E8=87=AA=E5=8A=A8=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=8E=89=E9=94=81=E5=AE=9A=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/PromoteController.class.php | 6 +++---
 Application/Common/Common/extend.php                     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index e19525af9..e5c4f2532 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -53,7 +53,8 @@ class PromoteController extends ThinkController
                 if ($_REQUEST['parent_id']=='全部') {
                     unset($_REQUEST['parent_id']);
                 }
-                $zid=get_zi_promote_id($_REQUEST['parent_id']);
+                $zid = get_zi_promote_id($_REQUEST['parent_id'], null);
+//                dd($zid);
                 if ($zid) {
                     $zid=$zid.','.$_REQUEST['parent_id'];
                 } else {
@@ -134,11 +135,10 @@ class PromoteController extends ThinkController
             }
         }
 
-        // dump($map);die();
+
         //为数据权限添加
         setPowerPromoteIds($map, 'id');
         $list_data = D(self::model_name)->where($map)->order('id DESC')->page($p, $row)->select();
-        
         $oa_data = [];
         if (I('oa_associated', -1) == -1) {
             foreach ($list_data as $k => $v) {
diff --git a/Application/Common/Common/extend.php b/Application/Common/Common/extend.php
index 223d6ce23..3185e289c 100644
--- a/Application/Common/Common/extend.php
+++ b/Application/Common/Common/extend.php
@@ -2015,8 +2015,8 @@ function get_parent_promote_($prmote_id=0,$isShwo=true)
     return $result;
 }
 
-//获取当前子渠道
-function get_zi_promote_id($id){
+//获取当前子渠道,推广员列表不用过滤锁定的推广员
+function get_zi_promote_id($id, $status = 1){
     // $map['parent_id']=$id;
     // $map['grand_id'] = $id;
     // $map['_logic'] = 'or';
@@ -2035,8 +2035,8 @@ function get_zi_promote_id($id){
     if ($self['level'] == 1) {
         $self['chain'] = "/{$id}/";
     }
-
-    $map['status'] = 1;
+    if ($status)
+    $map['status'] = $status;
     $map["chain"] = array("LIKE","%{$self['chain']}%");
     $map["level"] = array("GT",$self['level']);