From 654db0ff9e69a9bddcefa96d31acfe99c449fc22 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Mon, 2 Dec 2019 15:58:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96APP?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/AppMenuDao.xml           | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml
index ee61a0323..9fdecd6d9 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml
@@ -88,7 +88,7 @@
     </resultMap>
 
     <select id="indexPanelByMobile" resultMap="EpdcIndexPanelResultDTOMap">
-        SELECT
+         SELECT
             lp.field_value AS mainLabel,
             t.COLUMN_AMOUNT AS columnAmount,
             t.BACKGROUND_COLOR AS backgroundColor,
@@ -114,14 +114,12 @@
         FROM
             sys_user u
             LEFT JOIN sys_role_user ru ON ru.user_id = u.id
-            LEFT JOIN sys_role r ON ru.role_id = r.id
-            LEFT JOIN sys_app_role_menu am ON am.role_id = r.id
+            LEFT JOIN sys_app_role_menu am ON am.role_id = ru.role_id
             LEFT JOIN sys_app_menu m ON am.menu_id = m.id
         WHERE
-            u.mobile = #{value}
-            AND r.type_key = 'gridLeader'
+            u.mobile =#{value}
             AND am.menu_id IS NOT NULL
             AND m.pid = 0
-            )
+            )order by mp.sort asc,mc.sort asc
     </select>
 </mapper>