From f0601397ed62879820e3f6318acd1641651aea22 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 02 三月 2022 18:25:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 5516885..4557978 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
@@ -35,6 +35,7 @@
public class MenuService extends BaseServiceImpl<MenuMapper, Menu> {
private final RoleMenuRelationService roleMenuRelationService;
+
/**
* 鑾峰彇瑙掕壊涓嬬殑鑿滃崟
*/
@@ -49,7 +50,7 @@
public boolean addMenu(MenuParam param) {
Menu menu = new Menu();
- BeanUtils.copyProperties(param,menu);
+ BeanUtils.copyProperties(param, menu);
return save(menu);
}
@@ -78,7 +79,7 @@
return node;
}
- public boolean updateMenu(Long menuId,MenuParam param) {
+ public boolean updateMenu(Long menuId, MenuParam param) {
Menu one = getById(menuId);
if (one == null) {
throw new BusinessException("鎵句笉鍒拌彍鍗曚俊鎭�");
@@ -86,12 +87,12 @@
List<Role> roles = SpringContextHolder.getBean(RoleService.class).listByAdminId(SecurityUtils.getUserId());
Integer roleLevel = roles.stream().map(Role::getLevel).min(Integer::compareTo).orElse(RoleLevelStatus.COMMON.getCode());
- if(!RoleLevelStatus.SUPER.getCode().equals(roleLevel)){
+ if (!RoleLevelStatus.SUPER.getCode().equals(roleLevel)) {
throw new BusinessException("瓒呯骇绠＄悊鍛樻墠鍙互缂栬緫鑿滃崟");
}
Menu menu = new Menu();
- BeanUtils.copyProperties(param,menu);
+ BeanUtils.copyProperties(param, menu);
menu.setId(menuId);
return updateById(menu);
}
@@ -103,6 +104,8 @@
.map(menu -> covertMenuNode(menu, list)).collect(Collectors.toList());
}
+ private MenuMapper menuMapper;
+
public boolean delMenu(Long menuId) {
Menu one = getById(menuId);
if (one == null) {
@@ -111,9 +114,17 @@
List<Role> roles = SpringContextHolder.getBean(RoleService.class).listByAdminId(SecurityUtils.getUserId());
Integer roleLevel = roles.stream().map(Role::getLevel).min(Integer::compareTo).orElse(RoleLevelStatus.COMMON.getCode());
- if(!RoleLevelStatus.SUPER.getCode().equals(roleLevel)){
+ if (!RoleLevelStatus.SUPER.getCode().equals(roleLevel)) {
throw new BusinessException("瓒呯骇绠＄悊鍛樻墠鍙互鍒犻櫎鑿滃崟");
}
- return removeById(menuId);
+ List<Long> list = menuMapper.listMenuIfBinding(menuId);
+ List<Long> list1 = menuMapper.listMenuIfBinding1(menuId);
+
+ if (list.size() == 0 && list1.size() == 0) {
+ return removeById(menuId);
+ } else {
+ throw new BusinessException("鑿滃崟姝ｅ湪浣跨敤锛岃鍕垮垹闄�");
+ }
+
}
}
--
Gitblit v1.9.3