From 8ac0aae16563c65f7e200d56c9b62b332b6dc28f Mon Sep 17 00:00:00 2001
From: zhaoxiang <756958008@qq.com>
Date: Thu, 10 Nov 2016 14:21:27 +0800
Subject: [PATCH] =?UTF-8?q?added=20=E9=80=82=E9=85=8D=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=88=B6=E5=AD=90=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Menu.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php
index 67379b8..5b56470 100644
--- a/application/admin/controller/Menu.php
+++ b/application/admin/controller/Menu.php
@@ -10,8 +10,19 @@ use think\Validate;
 class Menu extends Base {
 
     public function index(){
-        $data = \app\admin\model\Menu::all();
-        foreach ( $data as &$value ){
+        $data = [];
+        $dataObj = \app\admin\model\Menu::all(function($query){
+            $query->order('sort', 'asc');
+        });
+        foreach ($dataObj as $value){
+            $data[] = $value->toArray();
+        }
+        $data = formatTree(listToTree($data));
+        foreach( $data as &$value ){
+            $value['name'] = $value['showName'];
+            unset($value['showName']);
+            unset($value['namePrefix']);
+            unset($value['lv']);
             $value['post'] = intval(boolval($value['auth'] & \Permission::AUTH_POST));
             $value['get'] = intval(boolval($value['auth'] & \Permission::AUTH_GET));
             $value['put'] = intval(boolval($value['auth'] & \Permission::AUTH_PUT));