From 3b91c084d9bcdce55a53b810dfeb61d39440f23f Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 12 Sep 2017 15:52:06 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=8F=9C=E5=8D=95=E9=80=89=E6=8B=A9=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Menu.php | 2 +-
 extend/service/ToolsService.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php
index f63e0081c..46f7078fe 100644
--- a/application/admin/controller/Menu.php
+++ b/application/admin/controller/Menu.php
@@ -83,7 +83,7 @@ class Menu extends BasicAdmin
     {
         if ($this->request->isGet()) {
             // 上级菜单处理
-            $_menus = Db::name($this->table)->where(['status' => '1'])->order('sort desc,id desc')->select();
+            $_menus = Db::name($this->table)->where(['status' => '1'])->order('sort asc,id asc')->select();
             $_menus[] = ['title' => '顶级菜单', 'id' => '0', 'pid' => '-1'];
             $menus = ToolsService::arr2table($_menus);
             foreach ($menus as $key => &$menu) {
diff --git a/extend/service/ToolsService.php b/extend/service/ToolsService.php
index 84d435db3..7cfb8b613 100644
--- a/extend/service/ToolsService.php
+++ b/extend/service/ToolsService.php
@@ -118,7 +118,7 @@ class ToolsService
      * @param string $ppath
      * @return array
      */
-    public static function arr2table($list, $id = 'id', $pid = 'pid', $path = 'path', $ppath = '')
+    public static function arr2table(array $list, $id = 'id', $pid = 'pid', $path = 'path', $ppath = '')
     {
         $tree = [];
         foreach (self::arr2tree($list, $id, $pid) as $attr) {