diff --git a/app/admin/controller/v1/User.php b/app/admin/controller/v1/User.php index 38684be7..36a48d4b 100644 --- a/app/admin/controller/v1/User.php +++ b/app/admin/controller/v1/User.php @@ -43,6 +43,7 @@ class User ->where('authority.menu_id = menu.id') ->group('authority.menu_id'); }) + ->order(['menu.sort' => 'asc', 'menu.id' => 'desc']) ->select(); if (!$menus->isEmpty()) { $authoritys = SysRoleAuthorityModel::field([ @@ -56,24 +57,22 @@ class User foreach ($authoritys as $val) { $authoritys_map[$val['menu_id']][] = $val['permission']; } - if (!empty($authoritys_map)) { - $menus->each(function($item) use($authoritys_map) { - $meta = [ - 'title' => $item['title'], - 'icon' => $item['icon'], - 'isKeepAlive' => !!$item['keep_alive'], - 'actived' => !!$item['actived'], - 'permissions' => [] - ]; - unset($item['title'], $item['icon'], $item['keep_alive'], $item['actived']); - if (isset($authoritys_map[$item['id']])) { - $meta['permissions'] = $authoritys_map[$item['id']]; - } - $item['hidden'] = !!$item['hidden']; - $item['meta'] = $meta; - return $item; - }); - } + $menus->each(function($item) use($authoritys_map) { + $meta = [ + 'title' => $item['title'], + 'icon' => $item['icon'], + 'isKeepAlive' => !!$item['keep_alive'], + 'actived' => !!$item['actived'], + 'permissions' => [] + ]; + unset($item['title'], $item['icon'], $item['keep_alive'], $item['actived']); + if (isset($authoritys_map[$item['id']])) { + $meta['permissions'] = $authoritys_map[$item['id']]; + } + $item['hidden'] = !!$item['hidden']; + $item['meta'] = $meta; + return $item; + }); } return success('获取成功', array_to_tree($menus->toArray(), 0, 'pid', false));