From aeb7d068be92312dcdcea75e1240bcf2a78dd0fe Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 29 Jul 2024 16:49:58 +0800
Subject: [PATCH] 代码优化
---
src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
index 0d3c539..06506da 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
@@ -110,6 +110,16 @@
public static final List<Integer> list2 = Arrays.asList(1, 11, null);
+ /**
+ *
+ * @param roleId
+ * @param topMenuId
+ * @param labelType
+ * @param menuType
+ * @param roleName
+ * @param houseCode
+ * @return
+ */
@Override
public List<MenuVO> routes(String roleId, Long topMenuId, Integer labelType, Integer menuType, String roleName,String houseCode) {
if (StringUtil.isBlank(roleId)) {
@@ -354,7 +364,10 @@
} else {
menuQueryWrapper.ne(Menu::getId, menu.getId()).eq(Menu::getIsDeleted, 0).and(
wrapper -> wrapper.eq(Menu::getCode, menu.getCode()).or(
- o -> o.eq(Menu::getName, menu.getName()).eq(Menu::getCategory, MENU_CATEGORY)
+ o -> o.eq(Menu::getName, menu.getName())
+ .eq(Menu::getCategory, MENU_CATEGORY)
+ .eq(Menu::getMenuType, menu.getMenuType())
+ .eq(Menu::getParentId, menu.getParentId())
)
);
}
--
Gitblit v1.9.3