From 5f0d9a00a1e0f27c2f8396dcd98fac5022aa40c7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 13 四月 2024 20:48:04 +0800
Subject: [PATCH] 内网开发环境代码合并
---
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