From ff36fdc836f892fc15e2ea10ad57c817fefdd7cc Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Tue, 23 Dec 2025 14:58:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=81=E4=B8=9A=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java | 7 +++----
 .../repository/impl/CorpInfoRepositoryImpl.java            | 3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java
index 24cfb2b0..0a37b0fd 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java
@@ -50,11 +50,10 @@ public class CorpInfoGatewayImpl implements CorpInfoGateway {
         if(!CorpInfoE.isCorp()){
             d.setAccountContactId(AuthContext.getUserId());
             d.setAccountContactName(AuthContext.getName());
-            CorpInfoDO corpInfoDO = corpInfoRepository.getById(AuthContext.getTenantId());
-            d.setTenantName(corpInfoDO.getCorpName());
-        }else{
-            d.setTenantName(AuthContext.getCurrentUser().getTenantName());
+
         }
+        d.setTenantName(AuthContext.getCurrentUser().getTenantName());
+
         corpInfoRepository.saveCorp(d);
 //        corpInfoRepository.save(d);
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java
index 61596940..0386f2aa 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java
@@ -104,7 +104,8 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
     public void saveCorp(CorpInfoDO corpInfoDO) {
         SSOUser ssoUser = AuthContext.getCurrentUser();
         Long tenantId = ssoUser.getTenantId();
-        MultiResponse<TenantTypeCO> tenantTypeResponse = tenantTypeFacade.listByTenantIdAndNotDefualt(tenantId);
+        List<String> tenantParentIds = Arrays.asList(ssoUser.getTenantParentIds().split(","));
+        MultiResponse<TenantTypeCO> tenantTypeResponse = tenantTypeFacade.listByTenantIdAndNotDefualt(Long.parseLong( tenantParentIds.get(1)));
         Map<String, Long> tenantTypeMap = tenantTypeResponse.getData().stream().collect(Collectors.toMap(TenantTypeCO::getTenantTypeName, TenantTypeCO::getId));
         OpeUnitAddCmd ouac = new OpeUnitAddCmd();
         ouac.setTenantName(corpInfoDO.getCorpName());