diff --git a/app/model/SysUser.php b/app/model/SysUser.php index 3fedb80..b483dd9 100644 --- a/app/model/SysUser.php +++ b/app/model/SysUser.php @@ -50,23 +50,26 @@ class SysUser extends BaseModel { $menus = []; $roleIds = $this->roles->column('role_id'); - dd($roleIds); - $this->roles->load(['menus']); + if(in_array(1,$roleIds)) { + $auths = SysMenu::select()->toArray(); + }else{ + $this->roles->load(['menus']); - foreach ($this->roles as $role) { - $menus = array_merge($menus, $role->menus->hidden(['pivot'])->where('deleted', 0)->toArray()); - } - $uniqueMenus = []; - foreach ($menus as $menu) { - $uniqueMenus[$menu['menuId']] = $menu; + foreach ($this->roles as $role) { + $menus = array_merge($menus, $role->menus->hidden(['pivot'])->where('deleted', 0)->toArray()); + } + $uniqueMenus = []; + foreach ($menus as $menu) { + $uniqueMenus[$menu['menuId']] = $menu; + } + $auths = array_values($uniqueMenus); } - $array = array_values($uniqueMenus); - usort($array, function($a, $b) { + usort($auths, function($a, $b) { return $a['sortNumber'] <=> $b['sortNumber']; }); - return $array; + return $auths; } /**