|
@@ -1399,6 +1399,10 @@ class EmployeeService extends Service
|
|
foreach ($button as $value){
|
|
foreach ($button as $value){
|
|
$button_map[$value['menu_id']][] = $value;
|
|
$button_map[$value['menu_id']][] = $value;
|
|
}
|
|
}
|
|
|
|
+ $special_button = config('specialButton');
|
|
|
|
+ foreach ($special_button as $value){
|
|
|
|
+ $button_map[$value['menu_id']][] = $value;
|
|
|
|
+ }
|
|
|
|
|
|
$object = [];
|
|
$object = [];
|
|
|
|
|
|
@@ -1423,12 +1427,14 @@ class EmployeeService extends Service
|
|
$menu_map = array_column($menu,'uri','id');
|
|
$menu_map = array_column($menu,'uri','id');
|
|
//该角色下 菜单里所有按钮
|
|
//该角色下 菜单里所有按钮
|
|
$button_menu = $this->fillRoleButton($role_id);
|
|
$button_menu = $this->fillRoleButton($role_id);
|
|
- $button_t = array_column($button,null,'id');
|
|
|
|
foreach ($search as $value){
|
|
foreach ($search as $value){
|
|
$bt = $button_menu[$value['menu_id']] ?? [];
|
|
$bt = $button_menu[$value['menu_id']] ?? [];
|
|
|
|
+
|
|
$new = [];
|
|
$new = [];
|
|
|
|
+ $button_tmp = $button_map[$value['menu_id']] ?? [];
|
|
|
|
+ $button_tmp = array_column($button_tmp,null,'id');
|
|
foreach ($bt as $b){
|
|
foreach ($bt as $b){
|
|
- if(! empty($button_t[$b])) $new[] = $button_t[$b];
|
|
|
|
|
|
+ if(! empty($button_tmp[$b])) $new[] = $button_tmp[$b];
|
|
}
|
|
}
|
|
|
|
|
|
$object[] = [
|
|
$object[] = [
|