From a39d4dca2a14176d372540b18663b53dc3a83909 Mon Sep 17 00:00:00 2001
From: zhaoxiang <756958008@qq.com>
Date: Thu, 10 Nov 2016 15:30:16 +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 | 30 +++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php
index 5b56470..d50e943 100644
--- a/application/admin/controller/Menu.php
+++ b/application/admin/controller/Menu.php
@@ -201,7 +201,20 @@ class Menu extends Base {
                 $this->success('操作成功！', url('Menu/index'));
             }
         }else{
-            $data = \app\admin\model\Menu::where([])->column('name',$this->primaryKey);
+            $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']);
+            }
+            $data = array_column($data, 'name', $this->primaryKey);
             $defaultFather = $this->request->get($this->primaryKey);
             $form = [
                 'tempType' => 'add',
@@ -336,7 +349,20 @@ class Menu extends Base {
                 $this->success('操作成功！', url('Menu/index'));
             }
         }else{
-            $data = \app\admin\model\Menu::where([])->column('name',$this->primaryKey);
+            $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']);
+            }
+            $data = array_column($data, 'name', $this->primaryKey);
             $detail = \app\admin\model\Menu::get($this->request->get($this->primaryKey))->toArray();
             $form = [
                 'tempType' => 'edit',