From ab03d93d2a60307cc30d33215fff12a55fc41cec Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期四, 03 六月 2021 15:46:23 +0800
Subject: [PATCH] 更新登录superuser的菜单格式
---
src/main/resources/mapper/RoleMenuMapper.xml | 8 ++++++++
src/main/java/com/whyc/service/LoginService.java | 5 +----
src/main/java/com/whyc/mapper/RoleMenuMapper.java | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/mapper/RoleMenuMapper.java b/src/main/java/com/whyc/mapper/RoleMenuMapper.java
index 44577a0..e107023 100644
--- a/src/main/java/com/whyc/mapper/RoleMenuMapper.java
+++ b/src/main/java/com/whyc/mapper/RoleMenuMapper.java
@@ -15,5 +15,5 @@
List<Menu> getUserMenu(@Param("id") Integer id);
-
+ List<Menu> getSuperUserMenu();
}
diff --git a/src/main/java/com/whyc/service/LoginService.java b/src/main/java/com/whyc/service/LoginService.java
index 6e5f042..14aa756 100644
--- a/src/main/java/com/whyc/service/LoginService.java
+++ b/src/main/java/com/whyc/service/LoginService.java
@@ -31,9 +31,6 @@
private UserMapper userMapper;
@Resource
- private MenuMapper menuMapper;
-
- @Resource
private RoleMenuMapper roleMenuMapper;
public Response login(String userName, String password, HttpServletRequest request) {
@@ -68,7 +65,7 @@
info.setTimestamp(System.currentTimeMillis());
info.setUser(user);
if ("superuser".equals(user.getName())){
- List<Menu> menuList = menuMapper.selectList(null);
+ List<Menu> menuList = roleMenuMapper.getSuperUserMenu();
info.setMenus(menuList);
}else{
info.setMenus(menus);
diff --git a/src/main/resources/mapper/RoleMenuMapper.xml b/src/main/resources/mapper/RoleMenuMapper.xml
index 6e00400..0a2adcc 100644
--- a/src/main/resources/mapper/RoleMenuMapper.xml
+++ b/src/main/resources/mapper/RoleMenuMapper.xml
@@ -31,4 +31,12 @@
where u.id=#{id} and role.state=0 ORDER BY pm.id,m.ord;
</select>
+
+ <select id="getSuperUserMenu" resultMap="MenuMap">
+ select pm.id,pm.name,pm.url,pm.icon,pm.level,pm.ord,m.id mid,m.name mname,m.url murl,m.icon micon,m.level mlevel,m.ord mord
+ from tb_menu m
+ inner join tb_menu pm on m.menu_id = pm.id
+ ORDER BY pm.id,m.ord;
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1