From 9e0878554bd16775e3eb96bb88d351c5030bf7e1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 27 十一月 2024 10:55:18 +0800
Subject: [PATCH] 1
---
se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java
index 370f492..b919d2c 100644
--- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java
+++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java
@@ -9,6 +9,7 @@
import java.util.Set;
import java.util.stream.Collectors;
+import com.se.system.api.domain.SysUser;
import com.se.system.domain.SysMenu;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,11 +18,10 @@
import com.se.common.core.utils.StringUtils;
import com.se.common.security.utils.SecurityUtils;
import com.se.system.api.domain.SysRole;
-import com.se.system.api.domain.SysUser;
import com.se.system.domain.vo.*;
import com.se.system.mapper.SysMenuMapper;
import com.se.system.mapper.*;
-import com.se.system.service.ISysMenuService;
+import com.se.system.service.inte.ISysMenuService;
/**
* 鑿滃崟 涓氬姟灞傚鐞�
@@ -61,15 +61,17 @@
*/
@Override
public List<SysMenu> selectMenuList(SysMenu menu, Long userId) {
- /*List<SysMenu> menuList = null;
+ List<SysMenu> menuList = null;
// 绠＄悊鍛樻樉绀烘墍鏈夎彍鍗曚俊鎭�
if (SysUser.isAdmin(userId)) {
menuList = menuMapper.selectMenuList(menu);
} else {
menu.getParams().put("userId", userId);
menuList = menuMapper.selectMenuListByUserId(menu);
- }*/
- return menuMapper.selectMenuListByUserId(menu, SecurityUtils.isAdmin(userId) ? null : userId);
+ }
+ //menu.setMenuId(SecurityUtils.isAdmin(userId) ? null : userId);
+
+ return menuMapper.selectMenuListByUserId(menu);
}
/**
@@ -117,16 +119,14 @@
*/
@Override
public List<SysMenu> selectMenuTreeByUserId(Long userId, String mark) {
- /*List<SysMenu> menus = null;
- if (SecurityUtils.isAdmin(userId))
- {
- menus = menuMapper.selectMenuTreeAll();
+ List<SysMenu> menus = null;
+ if (SecurityUtils.isAdmin(userId)) {
+ menus = menuMapper.selectMenuTreeAll(mark);
+ } else {
+ //menus = menuMapper.selectMenuTreeByUserId(userId, mark);
+ menus = menuMapper.selectMenuTreeByUserId(userId, mark);
}
- else
- {
- menus = menuMapper.selectMenuTreeByUserId(userId);
- }*/
- List<SysMenu> menus = menuMapper.selectMenuTreeByUserId(SecurityUtils.isAdmin(userId) ? null : userId, mark);
+ //List<SysMenu> menus = menuMapper.selectMenuTreeByUserId(SecurityUtils.isAdmin(userId) ? null : userId, mark);
return getChildPerms(menus, 0);
}
--
Gitblit v1.9.3