From de3b099bc86e8bed76637e6209219ee6eaf785bd Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 09:44:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
index 7b1fde8..e2945b0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
@@ -36,6 +36,7 @@
public class MenuService extends BaseServiceImpl<MenuMapper, Menu> {
private final RoleMenuRelationService roleMenuRelationService;
+ private MenuMapper menuMapper;
/**
* 鑾峰彇瑙掕壊涓嬬殑鑿滃崟
@@ -46,7 +47,8 @@
if (CollectionUtil.isEmpty(menuIdList)) {
return null;
}
- return listByIds(menuIdList);
+
+ return menuMapper.listMenuById(menuIdList);
}
public boolean addMenu(MenuParam param) {
@@ -107,8 +109,6 @@
.filter(menu -> menu.getPid().equals(0L))
.map(menu -> covertMenuNode(menu, list)).collect(Collectors.toList());
}
-
- private MenuMapper menuMapper;
public boolean delMenu(Long menuId) {
Menu one = getById(menuId);
--
Gitblit v1.9.3