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/resources/mapper/system/SysMenuMapper.xml | 3 +++
se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java | 10 ++++++++--
se-modules/se-system/src/main/resources/bootstrap.yml | 2 +-
se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java | 8 +++++---
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java
index 054c837..47f6da2 100644
--- a/se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java
+++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java
@@ -40,8 +40,14 @@
*/
@RequiresPermissions("system:menu:list")
@GetMapping("/list")
- public AjaxResult list(SysMenu menu)
- {
+ public AjaxResult list(SysMenu menu) {
+ if (StringUtils.isEmpty(menu.getMark())) {
+ menu.setMark("sys");
+ }
+ if ("all".equals(menu.getMark())) {
+ menu.setMark(null);
+ }
+
Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectMenuList(menu, userId);
return success(menus);
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 9a8050e..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;
@@ -60,15 +61,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);
- }*/
- menu.setMenuId(SecurityUtils.isAdmin(userId) ? null : userId);
+ }
+ //menu.setMenuId(SecurityUtils.isAdmin(userId) ? null : userId);
+
return menuMapper.selectMenuListByUserId(menu);
}
diff --git a/se-modules/se-system/src/main/resources/bootstrap.yml b/se-modules/se-system/src/main/resources/bootstrap.yml
index 760e409..1889f9a 100644
--- a/se-modules/se-system/src/main/resources/bootstrap.yml
+++ b/se-modules/se-system/src/main/resources/bootstrap.yml
@@ -25,4 +25,4 @@
# 鍏变韩閰嶇疆
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-enableEncrypt: false
\ No newline at end of file
+enableEncrypt: true
\ No newline at end of file
diff --git a/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml b/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 3fa509e..3f461a7 100644
--- a/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -46,6 +46,9 @@
<if test="status != null and status != ''">
AND status = #{status}
</if>
+ <if test="mark != null and mark != ''">
+ and mark = #{mark}
+ </if>
</where>
order by parent_id, order_num
</select>
--
Gitblit v1.9.3