From efee0d58cec1ea9edac1fb66836361f93503db97 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Tue, 25 Nov 2025 15:53:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E6=96=B0?= =?UTF-8?q?=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/domain/enums/CorpTypeEnum.java | 9 +++++- .../basic/info/domain/model/CorpInfoE.java | 5 ++- .../impl/CorpInfoRepositoryImpl.java | 31 ++++++++++++++----- 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java index 00ca815..025595e 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java @@ -54,5 +54,12 @@ public enum CorpTypeEnum { return null; } - + public static String getNameByCode(Integer code) { + for (CorpTypeEnum corpType : values()) { + if (corpType.code.equals(code)) { + return corpType.name; + } + } + return null; + } } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java index 984682a..d5070eb 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java @@ -3,6 +3,8 @@ package com.zcloud.basic.info.domain.model; import com.alibaba.cola.domain.Entity; import com.alibaba.cola.exception.BizException; import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.basic.info.domain.enums.CorpStateEnum; +import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.gbscommon.utils.MD5; import com.zcloud.gbscommon.utils.Sm2Util; import lombok.Data; @@ -10,6 +12,7 @@ import lombok.EqualsAndHashCode; import java.math.BigDecimal; import java.time.LocalDate; +import java.util.Map; /** * web-domain @@ -170,7 +173,7 @@ public class CorpInfoE extends BaseE { private String password; - public void initPassWord() throws Exception { + public void initPassWord() { String encrypt = Sm2Util.encryptHex(MD5.md5(defaultPassword), publicKey); this.setPassword(encrypt); } 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 9e2b5b6..dacb3ee 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 @@ -2,16 +2,21 @@ package com.zcloud.basic.info.persistence.repository.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.config.client.dicttree.facade.ConfDictTreeFacade; +import com.jjb.saas.config.client.dicttree.response.ConfDictTreeCO; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.jjb.saas.system.client.tenant.facade.TenantFacade; +import com.jjb.saas.system.client.tenanttype.facade.TenantTypeFacade; +import com.jjb.saas.system.client.tenanttype.response.TenantTypeCO; import com.jjb.saas.system.client.unit.facade.UnitFacade; import com.jjb.saas.system.client.unit.request.OpeUnitAddCmd; import com.jjb.saas.system.client.unit.request.OpeUnitUpdateCmd; @@ -50,6 +55,12 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { IPage iPage = new Query().getPage(params); @@ -73,19 +84,25 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl confDictCOList = confDictTreeFacade.listByAppKeyAndParentIdTree("0bb989ecada5470c87635018ece9f327", 1986379731994513408L); + SSOUser ssoUser = AuthContext.getCurrentUser(); + Long tenantId = ssoUser.getTenantId(); + MultiResponse tenantTypeResponse = tenantTypeFacade.listByTenantIdAndNotDefualt(tenantId); + Map tenantTypeMap = tenantTypeResponse.getData().stream().collect(Collectors.toMap(TenantTypeCO::getTenantTypeName, TenantTypeCO::getId)); OpeUnitAddCmd ouac = new OpeUnitAddCmd(); ouac.setTenantName(corpInfoDO.getCorpName()); + ouac.setTenantTypeId(tenantTypeMap.get(CorpTypeEnum.getNameByCode(corpInfoDO.getType()))); //企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位) - if(corpInfoDO.getType() == 0 || corpInfoDO.getType() == 1 || corpInfoDO.getType() == 2){ - ouac.setTenantTypeId(1990693345743208448L); - } else if (corpInfoDO.getType() == 3 || corpInfoDO.getType() == 4 || corpInfoDO.getType() == 5){ - ouac.setTenantTypeId(1990693388072124416L); - } +// if(corpInfoDO.getType() == 0 || corpInfoDO.getType() == 1 || corpInfoDO.getType() == 2){ +// ouac.setTenantTypeId(1990693345743208448L); +// } else if (corpInfoDO.getType() == 2){ +// ouac.setTenantTypeId(1990693388072124416L); +// } else if (corpInfoDO.getType() == 3 || corpInfoDO.getType() == 4 || corpInfoDO.getType() == 5){ +// ouac.setTenantTypeId(1990693388072124416L); +// } // LocalDate ouac.setEffectiveDate(LocalDate.of(2099, 12, 31)); ouac.setAccount(corpInfoDO.getCorpName()); - SSOUser ssoUser = AuthContext.getCurrentUser(); - Long tenantId = ssoUser.getTenantId(); ouac.setTenantId(tenantId); ouac.setPassword(corpInfoDO.getPassword()); try {