From e11deb9e6fb08fa526175b3057e03f0e6ee40e18 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 24 七月 2023 20:11:01 +0800
Subject: [PATCH] 修改菜单别名重复问题

---
 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
index dac120f..07612e6 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
@@ -270,15 +270,19 @@
 	@Override
 	public boolean submit(Menu menu) {
 		LambdaQueryWrapper<Menu> menuQueryWrapper = Wrappers.lambdaQuery();
+		// 鏂板
 		if (menu.getId() == null) {
-			menuQueryWrapper.eq(Menu::getCode, menu.getCode()).or(
-				wrapper -> wrapper.eq(Menu::getName, menu.getName()).eq(Menu::getCategory, MENU_CATEGORY)
-			);
+			//妫�楠屾槸鍚﹂噸澶嶈彍鍗曞埆鍚嶏紝鍙牎楠屽悓涓�鐖跺垎绫昏彍鍗曚笅鐨勭紪鍙锋槸鍚﹂噸澶�
+			menuQueryWrapper.eq(Menu::getParentId,menu.getParentId()!=null ? menu.getParentId():BladeConstant.TOP_PARENT_ID)
+				.eq(Menu::getCode, menu.getCode())
+				.or(wrapper -> wrapper.eq(Menu::getName, menu.getName()).eq(Menu::getCategory, MENU_CATEGORY))
+			;
 		} else {
+			// 淇敼
 			menuQueryWrapper.ne(Menu::getId, menu.getId()).and(
-				wrapper -> wrapper.eq(Menu::getCode, menu.getCode()).or(
-					o -> o.eq(Menu::getName, menu.getName()).eq(Menu::getCategory, MENU_CATEGORY)
-				)
+				wrapper -> wrapper.eq(Menu::getCode, menu.getCode())
+					.eq(Menu::getParentId,menu.getParentId())
+					.or(o -> o.eq(Menu::getName, menu.getName()).eq(Menu::getCategory, MENU_CATEGORY))
 			);
 		}
 		Long cnt = baseMapper.selectCount(menuQueryWrapper);

--
Gitblit v1.9.3