From be9384a8b3f1bea4735f0f013ffca878568937ca Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期四, 27 七月 2023 17:05:42 +0800
Subject: [PATCH] 1、修改owner字段为时间类型错误问题。 2、保存时处理字段不是这个业务类型表里面的字段对比。

---
 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