From 5ccda517b385c9791ae8538b84771a46e984a502 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 27 Jul 2021 14:49:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E5=8F=B8=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Common/extend.php           | 40 -------------------
 .../PromoteCompanyController.class.php        |  4 +-
 2 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php
index 318e61a59..18cc09921 100644
--- a/Application/Admin/Common/extend.php
+++ b/Application/Admin/Common/extend.php
@@ -3132,46 +3132,6 @@ function promote_listsMarket($type){
 
     return $data;
 }
-//市场部获取公司或推广员id
-function getMarketAuthPromoteId()
-{
-    $map['level'] = 1;
-    if (isMarketLeader()) {
-        //搜索所有市场部管理员id
-        $mid =  M("AuthGroup")->where("title like '%市场%'")->getField("id",true);
-        $mid = implode(",",$mid);
-
-        $admin_id = M("AuthGroupAccess")->where("group_id in ({$mid})")->getField("uid",true);
-        $admin_id = implode(",",$admin_id);
-
-        $map['admin_id'] = ['in', $admin_id];
-    }elseif(isMarketAdmin()){
-        $userAuth = session('user_auth');
-        $adminId = $userAuth['uid'];
-        $map['admin_id'] = $adminId;
-        
-    }else{
-        return false;
-    }
-    $dbres =  M("Promote","tab_")->where($map)->getField("id",true);
-    if(empty($dbres)){
-        return -1;
-    }else{
-        return implode(",",$dbres);
-    }
-}
-
-function throwPromoteIdToCompanyId($p_ids)
-{
-    $dbres =  M("Promote","tab_")->where("id in ({$p_ids})")->field("count(*) count,company_id")->group("company_id")->select();
-    if(empty($dbres)){
-        return -1;
-    }else{
-        return  implode(",",array_column($dbres,"company_id"));
-    }
-}
-
-        
 
 /**
  * 选择收款商户
diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index 01f3cb1b3..1de4601ec 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -49,10 +49,10 @@ class PromoteCompanyController extends ThinkController
         $company_name = trim(I('company_name'));
 
         //市场部权限begin
-        $pro_id = getMarketAuthPromoteId();
+        $pro_id = getPowerPromoteIds();
         if($pro_id){
             $promotemap["_string"] .=" AND p.id in ({$pro_id})";
-            $c_id =  throwPromoteIdToCompanyId($pro_id);
+            $c_id =  A("Market",'Event')->getAdminCompanyId();
             $map["_string"] .=" AND id in ({$c_id})";
         }