From 4f7362ec2854732c2ff2454331ec815c4c3147f0 Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期五, 22 十一月 2024 11:08:59 +0800
Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/se-cloud
---
se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 9a03e9f..25c4524 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
@@ -17,11 +17,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;
/**
* 鑿滃崟 涓氬姟灞傚鐞�
@@ -29,6 +28,7 @@
* @author admin
*/
@Service
+@SuppressWarnings("ALL")
public class SysMenuServiceImpl implements ISysMenuService {
public static final String PREMISSION_STRING = "perms[\"{0}\"]";
@@ -60,15 +60,16 @@
*/
@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 menuList;
+ }*/
+ menu.setMenuId(SecurityUtils.isAdmin(userId) ? null : userId);
+ return menuMapper.selectMenuListByUserId(menu);
}
/**
@@ -111,7 +112,7 @@
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟
*
* @param userId 鐢ㄦ埛鍚嶇О
- * @param mark 鏍囪瘑
+ * @param mark 鑿滃崟鏍囪瘑
* @return 鑿滃崟鍒楄〃
*/
@Override
@@ -337,8 +338,8 @@
/**
* 鑾峰彇璺敱鍚嶇О锛屽娌℃湁閰嶇疆璺敱鍚嶇О鍒欏彇璺敱鍦板潃
*
- * @param routerName 璺敱鍚嶇О
- * @param path 璺敱鍦板潃
+ * @param name 璺敱鍚嶇О
+ * @param path 璺敱鍦板潃
* @return 璺敱鍚嶇О锛堥┘宄版牸寮忥級
*/
public String getRouteName(String name, String path) {
--
Gitblit v1.9.3