diff --git a/application/admin/controller/orders/Configorder.php b/application/admin/controller/orders/Configorder.php index 52cc7df..d893123 100644 --- a/application/admin/controller/orders/Configorder.php +++ b/application/admin/controller/orders/Configorder.php @@ -62,7 +62,7 @@ class Configorder extends Backend list($where, $sort, $order, $offset, $limit) = $this->buildparams(); $list = $this->model ->tab(Order::TAB_SETTING) - ->configauth($this->auth,'dispatch_admin_id') + ->dispatcherauth($this->auth,'dispatch_admin_id') //->areaauth($this->auth) ->with(['dispatchadmin']) ->where($where); diff --git a/application/admin/library/Auth.php b/application/admin/library/Auth.php index f373298..c5d4411 100755 --- a/application/admin/library/Auth.php +++ b/application/admin/library/Auth.php @@ -617,14 +617,10 @@ class Auth extends \fast\Auth * @param $uid * @return bool */ - public function isAdminGroup($uid = null){ - $adminGroupIds = [1,11]; + public function isDispatcher($uid = null){ + $dispatcherGroupId = 6; $groupIds = $this->getGroupIds($uid); - $adminGroupIds = array_intersect($groupIds,$adminGroupIds); - if(!empty($adminGroupIds)){ - return false; - } - return true; + return in_array($dispatcherGroupId,$groupIds); } } diff --git a/application/admin/model/Order.php b/application/admin/model/Order.php index f5ec00b..6218187 100644 --- a/application/admin/model/Order.php +++ b/application/admin/model/Order.php @@ -248,9 +248,9 @@ class Order extends Model return $query; } - public function scopeConfigauth($query, Auth $auth, string $admin_id_field='admin_id'){ + public function scopeDispatcherauth($query, Auth $auth, string $admin_id_field='admin_id'){ - if(!$auth->isAdminGroup()){ + if($auth->isDispatcher()){ //是派单员 $query->where('fa_order.'.$admin_id_field,$auth->id); } return $query;