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 tenantTypeResponse = tenantTypeFacade.listByTenantIdAndNotDefualt(tenantId); + List tenantParentIds = Arrays.asList(ssoUser.getTenantParentIds().split(",")); + MultiResponse tenantTypeResponse = tenantTypeFacade.listByTenantIdAndNotDefualt(Long.parseLong( tenantParentIds.get(1))); Map tenantTypeMap = tenantTypeResponse.getData().stream().collect(Collectors.toMap(TenantTypeCO::getTenantTypeName, TenantTypeCO::getId)); OpeUnitAddCmd ouac = new OpeUnitAddCmd(); ouac.setTenantName(corpInfoDO.getCorpName());