优化

Application/Admin/Common/extend.php

@@ -2917,13 +2917,7 @@ function isMarketAdmin()
  */
 function getMarketAdmin() {
 
-    $map['group_id'] = ['in','11,12,21,25'];
-    $admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
-    $map['menber.uid'] = $admin_id;
-    if(is_administrator()||session('user_group_id') == 15||session('user_group_id') == 14||session('user_group_id') == 19||session('user_group_id') == 23||session('user_group_id') == 25) {
-        unset($map['menber.uid']);
-    }
-
+    $map['group_id'] =['in',A("Market","Event")->getMarketGroupId()];
     $data = M("auth_group_access")
         ->field("real_name,menber.uid,nickname")
         ->join("left join sys_member menber on sys_auth_group_access.uid = menber.uid")
@@ -3116,11 +3110,11 @@ function promote_listsMarket($type){
 
     setPowerPromoteIds($map,'id');
 
-    $admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
-    $map['admin_id'] = $admin_id;
-    if(is_administrator()||session('user_group_id') == 15||session('user_group_id') == 14||session('user_group_id') == 19||session('user_group_id') == 23) {
-        unset($map['admin_id']);
-    }
+    // $admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
+    // $map['admin_id'] = $admin_id;
+    // if(is_administrator()||session('user_group_id') == 15||session('user_group_id') == 14||session('user_group_id') == 19||session('user_group_id') == 23) {
+    //     unset($map['admin_id']);
+    // }
 
     $data = M('promote','tab_')->where($map)->select();
 

Application/Admin/Common/function.php

@@ -617,9 +617,16 @@ function getAllGame()
  */
 function getPromoteCompany()
 {
+    $companyId = A("Market","Event")->getAdminCompanyId();
+    $where = [
+        "status"=>1
+    ];
+    if($companyId != 'all'){
+        $where['id'] = ["in",$companyId];
+    }
     $list = M("PromoteCompany", 'tab_')
     ->field('id,company_name')
-    ->where("status = 1")
+    ->where($where)
     ->select();
     array_unshift($list,array("id"=>0,"company_name"=>C(DEFAULT_COMPANY)));//默认0
     return $list;

Application/Admin/Controller/MarketPercentageController.class.php

@@ -17,6 +17,7 @@ class MarketPercentageController extends ThinkController
     private $leavePercentage;
     private $unSettlementList;
     private $marketPercentage;
+    private $MarketEvent;
 
     private $returnMarketPercentageArray = [];
     private $returnWaitMarketPercentageArray = [];
@@ -39,6 +40,7 @@ class MarketPercentageController extends ThinkController
         //不结算列表
         $this->leavePercentage->unSettlementList();
         $this->unSettlementList = $this->leavePercentage->returnUnSettlementList();
+        $this->MarketEvent = A("Market","Event");
 
         parent::_initialize();
     }
@@ -46,7 +48,11 @@ class MarketPercentageController extends ThinkController
     public function index($row = 10, $p = 1)
     {
         
-        $map = [];
+        // $this->MarketEvent->getAdminCompanyId();
+        $map = [
+            "is_settlement"=>1,
+            "_string"=>"1=1"
+        ];
 
 //        $_REQUEST['pay_time']?($map['pay_time'] = $_REQUEST['pay_time']):'';
         $_REQUEST['promote_id'] ? ($map['promote_id'] = $_REQUEST['promote_id']) : '';
@@ -55,22 +61,33 @@ class MarketPercentageController extends ThinkController
         $_REQUEST['admin_id'] ? ($map['admin_id'] = $_REQUEST['admin_id']) : '';
         ($_REQUEST['company_id'] || $_REQUEST['company_id'] == '0') ? ($map['company_id'] = $_REQUEST['company_id']) : '';
 
+
         $admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
-        $map['admin_id'] = $admin_id;
-        $map['is_settlement'] = 1;
-        if (is_administrator() || session('user_group_id') == 15 || session('user_group_id') == 14 || session('user_group_id') == 19 || session('user_group_id') == 23) {
-            unset($map['admin_id']);
-            $admin_data = M("member")
-                ->field("access.uid admin_id")
-                ->join("left join sys_auth_group_access access on sys_member.uid = access.uid")
-                ->join("left join sys_auth_group auth on access.group_id=auth.id")
-                ->where(['group_id' => ['in', '11,12,21,25']])
-                ->select();
-            if ($admin_data) {
-                $map['admin_id'] = ['in', array_column($admin_data, 'admin_id')];
-            }
-            $_REQUEST['admin_id'] ? ($map['admin_id'] = $_REQUEST['admin_id']) : '';
-        }
+        $gid = session('user_group_id');
+        $markerGroup = $this->MarketEvent->isMarketAdminGroup($gid);
+        if($markerGroup){
+            $map['department_id'] =["in",[0,$markerGroup['department_id']]];
+            if( !$this->MarketEvent->isDepartmentLeder($markerGroup['department_id'],$admin_id)){
+                $map['admin_id'] = $admin_id ;
+            }
+        }
+        // dd($map);
+
+        // $map['admin_id'] = $admin_id;
+        // if (is_administrator() || session('user_group_id') == 15 || session('user_group_id') == 14 || session('user_group_id') == 19 || session('user_group_id') == 23) {
+        //     unset($map['admin_id']);
+        //     $admin_data = M("member")
+        //         ->field("access.uid admin_id")
+        //         ->join("left join sys_auth_group_access access on sys_member.uid = access.uid")
+        //         ->join("left join sys_auth_group auth on access.group_id=auth.id")
+        //         ->where(['group_id' => ['in', '11,12,21,25']])
+        //         ->select();
+        //     if ($admin_data) {
+        //         $map['admin_id'] = ['in', array_column($admin_data, 'admin_id')];
+        //     }
+        //     $_REQUEST['admin_id'] ? ($map['admin_id'] = $_REQUEST['admin_id']) : '';
+        // }
+
 
         $search_date = [];
         if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {