菜单按钮

app/Service/EmployeeService.php

@@ -293,7 +293,7 @@ class EmployeeService extends Service
             ->where('del_time',0)
             ->select('menu_id','type')
             ->get()->toArray();
-        $button = $this->fillRoleButton($data['role_id']);
+        $button = $this->fillRoleButton([$data['role_id']]);
         foreach ($menu as $key => $value){
             $menu[$key]['button'] = $button[$value['menu_id']] ?? [];
         }
@@ -626,7 +626,7 @@ class EmployeeService extends Service
             ->get()->toArray();
 
         //组织
-        $role_id = array_column($role,'role_id');
+        $role_id = array_unique(array_column($role,'role_id'));
         asort($role_id);
         $role_id = array_values($role_id);
 
@@ -724,13 +724,13 @@ class EmployeeService extends Service
     }
 
     public function fillRoleButton($role_id){
-        $button = RoleMenuButton::where('role_id',$role_id)
+        $button = RoleMenuButton::whereIn('role_id',$role_id)
             ->where('del_time',0)
             ->select('menu_id','button_id')
             ->get()->toArray();
         $button_map = [];
         foreach ($button as $value){
-            $button_map[$value['menu_id']][] = $value['button_id'];
+            if(! in_array($value['button_id'], $button_map[$value['menu_id']])) $button_map[$value['menu_id']][] = $value['button_id'];
         }
 
         return $button_map;