From 3c8ab4e99466f0037cda70ab6b99d91fe2a67db5 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Fri, 24 Apr 2020 17:29:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=E7=9A=84=E8=8F=9C=E5=8D=95=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/manage/controller/LoginController.java    | 2 +-
 power-dao/src/main/resources/mapper/Power_MenuMapper.xml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/power-admin/src/main/java/com/manage/controller/LoginController.java b/power-admin/src/main/java/com/manage/controller/LoginController.java
index 0bfe797..f81ac46 100644
--- a/power-admin/src/main/java/com/manage/controller/LoginController.java
+++ b/power-admin/src/main/java/com/manage/controller/LoginController.java
@@ -85,7 +85,7 @@ public class LoginController {
                 CacheManager.addExcCount("noExc");
                 List<Power_Menu> list = null;
                 List<User_Dept_Menu> menuList = new ArrayList<>();
-                Set<String> menus = new TreeSet<>();
+                Set<String> menus = new LinkedHashSet<>();
                 if (user.getRoleId().equals(0) || user.getRoleId().equals(-100)) {
                     list = powerMenuService.queryAllPowerMenu(null,user.getRoleId());
                 } else {
diff --git a/power-dao/src/main/resources/mapper/Power_MenuMapper.xml b/power-dao/src/main/resources/mapper/Power_MenuMapper.xml
index ee390ad..aa4ff3f 100644
--- a/power-dao/src/main/resources/mapper/Power_MenuMapper.xml
+++ b/power-dao/src/main/resources/mapper/Power_MenuMapper.xml
@@ -279,7 +279,7 @@
     <if test="sysFlag != '' and sysFlag != null">
       and sys_flag=#{sysFlag}
     </if>
-    order by sys_id,menu_id,sort
+    order by sys_id,parent_id,sort
   </select>
   <!--<select id="queryMenuViewByUserId" parameterType="java.lang.Integer"
           resultType="com.manage.entity.Power_Detailed_Menu">