From 16d2a38e7bb7a31d6e355d031115a58bffd0109d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 26 七月 2023 15:01:39 +0800
Subject: [PATCH] 增加菜单管理中,从其他菜单克隆按钮功能、

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index 9201f79..088566b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -162,11 +162,14 @@
 	 */
 	@Override
 	public boolean checkCodeRuleRepeat(CodeRuleDTO codeRuleDTO){
-		List<CodeRule> codeRulesList = this.codeRuleMapper.selectList(Wrappers.<CodeRule>query().lambda().eq(CodeRule::getId, codeRuleDTO.getId()));
+		// 鏍规嵁瑙勫垯id鏌ヨ缂栧彿
+		List<CodeRule> codeRulesList = this.codeRuleMapper.selectList(Wrappers.<CodeRule>query()
+			.lambda().eq(CodeRule::getId, codeRuleDTO.getId())
+			.eq(CodeRule::getTenantId,AuthUtil.getTenantId().equals(this.tenantId) ? "":codeRuleDTO.getTenantId()));
 		if(!codeRulesList.isEmpty()){
 			return codeRulesList.parallelStream().anyMatch(codeRule -> {
 				if(StringUtils.isNotBlank(codeRuleDTO.getOid())){
-					// 浠h〃鏄慨鏀�
+					// 浠h〃鏄慨鏀癸紝涓嶆槸灏嗙紪鍙蜂慨鏀圭浉鍚岀殑缂栧彿
 					return !codeRule.getOid().equals(codeRuleDTO.getOid());
 				}else {
 					return true;

--
Gitblit v1.9.3