diff --git a/app/controller/admin/system/auth/Menu.php b/app/controller/admin/system/auth/Menu.php index 9eb3daff..1434233b 100644 --- a/app/controller/admin/system/auth/Menu.php +++ b/app/controller/admin/system/auth/Menu.php @@ -197,14 +197,7 @@ class Menu extends BaseController $merchant = $this->request->merchant(); $level = $this->request->adminInfo()->level; if($level){ - if($level==2){ - - $value=Db::name('merchant_type')->where('type_code','dianpu_yunying')->value('mer_type_id'); - $column_ids=Relevance::where('left_id', $value)->where('type','mer_auth')->column('right_id'); - $menus= Db::name('system_menu')->whereIn('menu_id',$column_ids)->column('menu_name,route,params,icon,pid,menu_id'); - }else{ - $menus= $this->repository->ruleByMenuList($this->request->adminRule(), $this->merchant); - } + $menus= $this->repository->ruleByMenuList($this->request->adminRule(), $this->merchant); }else{ $menus=($merchant->type_id ? $this->repository->typesByValidMenuList($merchant->type_id) : $this->repository->getValidMenuList($this->merchant)); } diff --git a/app/controller/admin/system/merchant/Merchant.php b/app/controller/admin/system/merchant/Merchant.php index 9e509254..71a502a8 100644 --- a/app/controller/admin/system/merchant/Merchant.php +++ b/app/controller/admin/system/merchant/Merchant.php @@ -254,6 +254,7 @@ class Merchant extends BaseController 'account'=>'yy'.$admins['account'], 'real_name' => $admins['real_name'], 'phone' => $admins['phone'], + 'roles' => 26, 'level' => 2 ]; $adminRepository->create($data);