From caf1911134df4930ca32c8ae07bde2eb5a389d52 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Fri, 7 Nov 2025 14:46:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E5=A2=9E=E6=97=B6?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=B8=BB=E9=94=AE=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A432=E4=BD=8Duuid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/command/CorpQualificationInfoAddExe.java | 2 ++ .../zcloud/basic/info/command/query/DepartmentQueryExe.java | 2 +- .../com/zcloud/basic/info/service/CorpInfoServiceImpl.java | 2 -- .../zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java | 5 +++++ .../zcloud/basic/info/gatewayimpl/DepartmentGatewayImpl.java | 5 ++++- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/CorpQualificationInfoAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/CorpQualificationInfoAddExe.java index 8cdbaa9..935f96b 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/CorpQualificationInfoAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpQualificationInfoAddExe.java @@ -4,7 +4,9 @@ import com.alibaba.cola.exception.BizException; import com.zcloud.basic.info.domain.gateway.CorpQualificationInfoGateway; import com.zcloud.basic.info.domain.model.CorpQualificationInfoE; import com.zcloud.basic.info.dto.CorpQualificationInfoAddCmd; +import com.zcloud.gbscommon.utils.Tools; import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java index 8d941ee..630ca21 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java @@ -66,7 +66,7 @@ public class DepartmentQueryExe { return Collections.emptyList(); } List examCenterCOS = departmentCoConvertor.converDOsToInfoCOs(pageResponse); - //GBS部门根节点父部门是1 + //GBS部门根节点父部门是tenantId return Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList",AuthContext.getTenantId()); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java index 31406e1..d0881b1 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java @@ -43,8 +43,6 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI { @Override public SingleResponse add(CorpInfoAddCmd cmd) { -// Long userId = AuthContext.getUserId(); - cmd.setCorpinfoId(Tools.get32UUID()); Long id = corpInfoAddExe.execute(cmd); return SingleResponse.buildSuccess(); } 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 62aec59..cde0057 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 @@ -4,7 +4,9 @@ import com.zcloud.basic.info.domain.gateway.CorpInfoGateway; import com.zcloud.basic.info.domain.model.CorpInfoE; import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; import com.zcloud.basic.info.persistence.repository.CorpInfoRepository; +import com.zcloud.gbscommon.utils.Tools; import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -25,6 +27,9 @@ public class CorpInfoGatewayImpl implements CorpInfoGateway { public Long add(CorpInfoE corpInfoE) { CorpInfoDO d = new CorpInfoDO(); BeanUtils.copyProperties(corpInfoE, d); + if(StringUtils.isEmpty(d.getCorpinfoId())){ + d.setCorpinfoId(Tools.get32UUID()); + } corpInfoRepository.save(d); return d.getId(); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/DepartmentGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/DepartmentGatewayImpl.java index 32bbab2..ee46b1b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/DepartmentGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/DepartmentGatewayImpl.java @@ -6,6 +6,7 @@ import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; import com.zcloud.basic.info.persistence.repository.DepartmentRepository; import com.zcloud.gbscommon.utils.Tools; import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -26,7 +27,9 @@ public class DepartmentGatewayImpl implements DepartmentGateway { public Long add(DepartmentE departmentE) { DepartmentDO d = new DepartmentDO(); BeanUtils.copyProperties(departmentE, d); - d.setDepartmentId(Tools.get32UUID()); + if(StringUtils.isEmpty(d.getDepartmentId())){ + d.setDepartmentId(Tools.get32UUID()); + } departmentRepository.save(d); return d.getId(); }