From f66b7088e3cb603830b8a9127f2cda8fbb2acd17 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 21 Jul 2021 12:31:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 18 +++---- Application/Admin/Common/function.php | 9 +++- .../MarketPercentageController.class.php | 51 ++++++++++++------- 3 files changed, 48 insertions(+), 30 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 8cf3a1c3e..21d8119c0 100644 --- a/Application/Admin/Common/extend.php +++ b/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(); diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index 185a6143b..b77be82d9 100644 --- a/Application/Admin/Common/function.php +++ b/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; diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index 50485731b..6f7b3423b 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/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,14 +40,19 @@ class MarketPercentageController extends ThinkController //不结算列表 $this->leavePercentage->unSettlementList(); $this->unSettlementList = $this->leavePercentage->returnUnSettlementList(); + $this->MarketEvent = A("Market","Event"); parent::_initialize(); } 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'])) {