mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-11-14 20:10:11 +08:00
parent 82f9e4aa84
commit ecba122e1e
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controller/admin/system/auth/Menu.php
View File

@ -197,14 +197,7 @@ class Menu extends BaseController
$merchant = $this->request->merchant(); $merchant = $this->request->merchant();
$level = $this->request->adminInfo()->level; $level = $this->request->adminInfo()->level;
if($level){ if($level){
if($level==2){ $menus= $this->repository->ruleByMenuList($this->request->adminRule(), $this->merchant);
$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);
}
}else{ }else{
$menus=($merchant->type_id ? $this->repository->typesByValidMenuList($merchant->type_id) : $this->repository->getValidMenuList($this->merchant)); $menus=($merchant->type_id ? $this->repository->typesByValidMenuList($merchant->type_id) : $this->repository->getValidMenuList($this->merchant));
} }

1
app/controller/admin/system/merchant/Merchant.php
View File

@ -254,6 +254,7 @@ class Merchant extends BaseController
'account'=>'yy'.$admins['account'], 'account'=>'yy'.$admins['account'],
'real_name' => $admins['real_name'], 'real_name' => $admins['real_name'],
'phone' => $admins['phone'], 'phone' => $admins['phone'],
'roles' => 26,
'level' => 2 'level' => 2
]; ];
$adminRepository->create($data); $adminRepository->create($data);