|
@@ -633,25 +633,21 @@ class EmployeeService extends Service
|
|
|
return $object;
|
|
|
}
|
|
|
|
|
|
- foreach ($menu as $value){
|
|
|
- $object[$value['id']] = [
|
|
|
- 'type' => 1,//查看权限
|
|
|
- 'menu_id' => $value['id'],
|
|
|
- ];
|
|
|
- }
|
|
|
- if(empty($role_id)) return $object;
|
|
|
+ //没绑定角色
|
|
|
+ if(empty($role_id)) return [];
|
|
|
|
|
|
$search = RoleMenu::whereIn('role_id',$role_id)
|
|
|
->where('del_time',0)
|
|
|
->select('menu_id','type')
|
|
|
->get()->toArray();
|
|
|
foreach ($search as $value){
|
|
|
- if(isset($object[$value['menu_id']])){
|
|
|
- $object[$value['menu_id']]['type'] = $value['type'];
|
|
|
- }
|
|
|
+ $object[] = [
|
|
|
+ 'menu_id' => $value['menu_id'],
|
|
|
+ 'type' => $value['type'],
|
|
|
+ ];
|
|
|
}
|
|
|
|
|
|
- return array_values($object);
|
|
|
+ return $object;
|
|
|
}
|
|
|
|
|
|
//获取登录账号的权限部门
|