From 4167b21d9f2ad8774c248ef160910bea5311c002 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 13 四月 2022 18:14:10 +0800
Subject: [PATCH] 设备汇总
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java | 12 +++++++++---
1 files changed, 9 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 04b36e6..7b1fde8 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
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.enums.RoleLevelStatus;
import com.sandu.common.execption.BusinessException;
@@ -51,6 +52,7 @@
public boolean addMenu(MenuParam param) {
Menu menu = new Menu();
BeanUtils.copyProperties(param, menu);
+ menu.setPermission(param.getRouterName());
return save(menu);
}
@@ -93,12 +95,14 @@
Menu menu = new Menu();
BeanUtils.copyProperties(param, menu);
+ menu.setPermission(param.getRouterName());
menu.setId(menuId);
return updateById(menu);
}
public List<MenuNode> treeList() {
- List<Menu> list = list();
+ LambdaQueryWrapper<Menu> menuLambdaQueryWrapper = Wrappers.lambdaQuery(Menu.class).orderByAsc(Menu::getSeq);
+ List<Menu> list = list(menuLambdaQueryWrapper);
return list.stream()
.filter(menu -> menu.getPid().equals(0L))
.map(menu -> covertMenuNode(menu, list)).collect(Collectors.toList());
@@ -118,9 +122,11 @@
throw new BusinessException("瓒呯骇绠＄悊鍛樻墠鍙互鍒犻櫎鑿滃崟");
}
List<Long> list = menuMapper.listMenuIfBinding(menuId);
- if (list.size() == 0) {
+ List<Long> list1 = menuMapper.listMenuIfBinding1(menuId);
+
+ if (list.size() == 0 && list1.size() == 0) {
return removeById(menuId);
- }else{
+ } else {
throw new BusinessException("鑿滃崟姝ｅ湪浣跨敤锛岃鍕垮垹闄�");
}
--
Gitblit v1.9.3