From efbd2bf53db17f5fb95305937d7a7969b02029b3 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Wed, 19 Dec 2018 22:02:29 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/admin_menu.ftl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/templates/admin/admin_menu.ftl b/src/main/resources/templates/admin/admin_menu.ftl
index 89af9ad8d..db60455c7 100644
--- a/src/main/resources/templates/admin/admin_menu.ftl
+++ b/src/main/resources/templates/admin/admin_menu.ftl
@@ -25,21 +25,21 @@
                             <div class="box-body">
                                 <div class="form-group">
                                     <label for="menuName"><@spring.message code='admin.menus.form.menu-name' /></label>
-                                    <input type="text" class="form-control" id="menuName" name="menuName" value="${updateMenu.menuName}">
+                                    <input type="text" class="form-control" id="menuName" name="menuName" value="${updateMenu.menuName!}">
                                     <small><@spring.message code='admin.menus.form.menu-name-tips' /></small>
                                 </div>
                                 <div class="form-group">
                                     <label for="menuUrl"><@spring.message code='admin.menus.form.menu-url' /></label>
-                                    <input type="text" class="form-control" id="menuUrl" name="menuUrl" value="${updateMenu.menuUrl}">
+                                    <input type="text" class="form-control" id="menuUrl" name="menuUrl" value="${updateMenu.menuUrl!}">
                                     <small><@spring.message code='admin.menus.form.menu-url-tips' /></small>
                                 </div>
                                 <div class="form-group">
                                     <label for="menuSort"><@spring.message code='admin.menus.form.menu-sort' /></label>
-                                    <input type="number" class="form-control" id="menuSort" name="menuSort" value="${updateMenu.menuSort}">
+                                    <input type="number" class="form-control" id="menuSort" name="menuSort" value="${updateMenu.menuSort!}">
                                 </div>
                                 <div class="form-group">
                                     <label for="menuIcon"><@spring.message code='admin.menus.form.menu-icon' /></label>
-                                    <input type="text" class="form-control" id="menuIcon" name="menuIcon" value="${updateMenu.menuIcon}">
+                                    <input type="text" class="form-control" id="menuIcon" name="menuIcon" value="${updateMenu.menuIcon!}">
                                     <small><@spring.message code='admin.menus.form.menu-icon-tips' /></small>
                                 </div>
                                 <div class="form-group">
@@ -73,7 +73,7 @@
                                 </div>
                                 <div class="form-group">
                                     <label for="menuSort"><@spring.message code='admin.menus.form.menu-sort' /></label>
-                                    <input type="text" class="form-control" id="menuSort" name="menuSort">
+                                    <input type="number" class="form-control" id="menuSort" name="menuSort">
                                 </div>
                                 <div class="form-group">
                                     <label for="menuIcon"><@spring.message code='admin.menus.form.menu-icon' /></label>
@@ -112,7 +112,7 @@
                                 </tr>
                                 <@commonTag method="menus">
                                     <#if menus?? && menus?size gt 0>
-                                        <#list menus as menu>
+                                        <#list menus?sort_by('menuSort') as menu>
                                             <tr>
                                                 <td>${menu.menuName}</td>
                                                 <td>${menu.menuUrl}</td>