From 7bc2b875448f9e5311bcc987691b5475a06dfbcb Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 24 四月 2024 12:43:51 +0800
Subject: [PATCH] 1、集团码返码接口下标越界bug。 2、集团返码，需要修改我们系统中的属性，修改时需要判断每一个字段，确定哪些有修改，然后用oldBusinessData字段记录下修改前旧的业务数据。 3、同步型号代号，记录下对方的创建时间和修改时间。
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
index 9e274b1..2e90fe6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
@@ -20,6 +20,7 @@
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import com.vci.ubcs.system.cache.NacosConfigCache;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
@@ -79,7 +80,9 @@
// 鏍规嵁绉熸埛杩涜鍖哄垎瀵瑰簲鐨勫弬鐓ч厤缃�
Map<String, Object> conditionMap = bladeQueryObject.getConditionMap();
// 鏌ヨ鎵�灞炵鎴蜂笅鐨勫拰寮�鍚叏灞�鐨勫弬鐓ч厤缃俊鎭�
- conditionMap.put("tenantId",AuthUtil.getTenantId());
+ if(!NacosConfigCache.getAdminUserInfo().getTenantId().equals(AuthUtil.getTenantId())){
+ conditionMap.put("tenantId",AuthUtil.getTenantId());
+ }
conditionMap.put("isOpenGlobal","true");
BeanMap beanMap = BeanMap.create(codeReferConfig);
beanMap.putAll(conditionMap);
--
Gitblit v1.9.3