Commit af574bbc authored by hangjun83's avatar hangjun83

更新 ,权限调整

parent 130d55e8
...@@ -95,12 +95,17 @@ class MenusService ...@@ -95,12 +95,17 @@ class MenusService
$permission = []; $permission = [];
$permission['name'] = $result['menu_name']; $permission['name'] = $result['menu_name'];
$permission['menu_id'] = $result['id']; $permission['menu_id'] = $result['id'];
if(isset($params['button_type']) && !empty($params['button_type'])){ if(isset($params['type']) && !empty($params['type']) && 'button' == $params['type']){
$permission['action'] = substr($currentUri,1).'/'.$params['button_type']; if(Str::endsWith(strtolower((string) $request['name']), $params['button_type'])){
$permission['action'] = str_replace('_','.',$request['name']);
}else{ }else{
$permission['action'] = substr($currentUri,1).'/view'; $permission['action'] = str_replace('_','.',$request['name']).'.'.$params['button_type'];
} }
$permission['permission_type'] = 'button';
}else{
$permission['permission_type'] = 'menu'; $permission['permission_type'] = 'menu';
$permission['action'] = str_replace('_','.',$request['name']).'.list';
}
$permission['sys_default'] = 0; $permission['sys_default'] = 0;
$permission['remark'] = $result['menu_name'].'的相关权限'; $permission['remark'] = $result['menu_name'].'的相关权限';
$permission['guard_name'] = config('auth.defaults.guard'); $permission['guard_name'] = config('auth.defaults.guard');
...@@ -232,8 +237,12 @@ class MenusService ...@@ -232,8 +237,12 @@ class MenusService
$permission = []; $permission = [];
$permission['name'] = $result['menu_name']; $permission['name'] = $result['menu_name'];
$permission['menu_id'] = $result['id']; $permission['menu_id'] = $result['id'];
if(isset($params['button_type']) && !empty($params['button_type'])){ if(isset($params['menu_type']) && !empty($params['menu_type']) && 'button' == $params['menu_type']){
if(Str::endsWith(strtolower((string) $request['name']), $params['button_type'])){
$permission['action'] = str_replace('_','.',$request['name']);
}else{
$permission['action'] = str_replace('_','.',$request['name']).'.'.$params['button_type']; $permission['action'] = str_replace('_','.',$request['name']).'.'.$params['button_type'];
}
$permission['permission_type'] = 'button'; $permission['permission_type'] = 'button';
}else{ }else{
$permission['permission_type'] = 'menu'; $permission['permission_type'] = 'menu';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment