From 4dcd33301a852c3a2940fc01c79bd7e2261e97ba Mon Sep 17 00:00:00 2001
From: nicky <3623307211@qq.com>
Date: Mon, 22 Oct 2018 23:04:32 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20#=E8=A7=92=E8=89=B2=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96SQL=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mybatis/SysRoleMapper.xml    |  2 +-
 .../manager/web/controller/LoginController.java     | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/taoshop-manager/taoshop-manager-service/src/main/resources/mybatis/SysRoleMapper.xml b/src/taoshop-manager/taoshop-manager-service/src/main/resources/mybatis/SysRoleMapper.xml
index 929d9db..5e2e356 100644
--- a/src/taoshop-manager/taoshop-manager-service/src/main/resources/mybatis/SysRoleMapper.xml
+++ b/src/taoshop-manager/taoshop-manager-service/src/main/resources/mybatis/SysRoleMapper.xml
@@ -8,7 +8,7 @@
 
   <select id="listUserRole" parameterType="Integer" resultType="SysRole">
         SELECT
-          r.*,
+          r.*
         FROM
           sys_user_role ur
         LEFT JOIN sys_role r
diff --git a/src/taoshop-manager/taoshop-manager-web/src/main/java/com/muses/taoshop/manager/web/controller/LoginController.java b/src/taoshop-manager/taoshop-manager-web/src/main/java/com/muses/taoshop/manager/web/controller/LoginController.java
index ecea086..c33cb55 100644
--- a/src/taoshop-manager/taoshop-manager-web/src/main/java/com/muses/taoshop/manager/web/controller/LoginController.java
+++ b/src/taoshop-manager/taoshop-manager-web/src/main/java/com/muses/taoshop/manager/web/controller/LoginController.java
@@ -163,15 +163,14 @@ public class LoginController extends BaseController {
                 }
             }
             log.info("权限集合:{}"+permissions.toString());
-            /* 获取用户可以查看的菜单 */
             List<Menu> menuList = new ArrayList<Menu>();
-            for(Permission p : permissions){
-                Menu menu = iMenuService.listMenu(p.getId());
-                menuList.add(menu);
-            }
+//            for(Permission p : permissions){
+//                Menu menu = iMenuService.listMenu(p.getId());
+//                menuList.add(menu);
+//            }
             /* E3：获取权限对应的菜单信息*/
-            //TODO 方法二: 直接通过SQL获取权限菜单
-            //menuList = iMenuService.listPermissionMenu(user.getId());
+            //方法二: 直接通过SQL获取权限菜单
+            menuList = iMenuService.listPermissionMenu(user.getId());
             log.info("用户可以查看的菜单个数:{}"+menuList.size());
             MenuTreeUtil treeUtil = new MenuTreeUtil();
             if(!CollectionUtils.isEmpty(menuList)) {
-- 
GitLab