From 40f95f45ea8babb2ef66cdac90a6945431ce4a1e Mon Sep 17 00:00:00 2001 From: yanglin Date: Fri, 21 Feb 2025 14:04:16 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E4=B8=8B=E8=BD=BD=E5=90=88?= =?UTF-8?q?=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanopart/ess/server/ess/EssService.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java index bdd6d084..f167710c 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java @@ -35,8 +35,6 @@ import org.springframework.transaction.support.TransactionTemplate; import java.util.function.Function; -import static cn.axzo.nanopart.ess.server.utils.BizAssertions.fail; - /** * @author yanglin */ @@ -68,14 +66,14 @@ public class EssService { public String getEmbedWebUrl(GetEmbedWebUrlRequest request) { EssPerson contextPerson; if (request.getEmbedType().getEssContext() == EssContext.CONTRACT) { - BizAssertions.assertNotNull(request.getBusinessId(), "合同ID不能为空"); + BizAssertions.assertNotBlank(request.getBusinessId(), "合同ID不能为空"); EssContract contract = essContractDao.getOrThrow(request.getBusinessId()); contextPerson = contractManager.getContractSuperAdmin(contract); } else if (request.getEmbedType().getEssContext() == EssContext.SEAL) { - BizAssertions.assertNotNull(request.getBusinessId(), "印章ID不能为空"); + BizAssertions.assertNotBlank(request.getBusinessId(), "印章ID不能为空"); contextPerson = orgManager.getSuperAdminOrThrow(request.getOuId()); } else { - throw fail("不支持的嵌入类型: {}", request.getEmbedType()); + contextPerson = orgManager.getSuperAdminOrThrow(request.getOuId()); } return essClient.getEmbedWebUrl( contextPerson, request.getEmbedType(), request.getBusinessId()); @@ -168,11 +166,6 @@ public class EssService { maybeUploadContractToOss(c); } - public String getContractPDFUrlFromEss(EssContract contract) { - EssPerson creator = orgManager.getSuperAdminOrThrow(contract.getCreatorOuId()); - return essClient.getContractPDFUrl(creator, contract.getEssContractId()); - } - public void maybeUploadContractToOss(EssContract contract) { essSupport.asyncExec(() -> { try { @@ -190,4 +183,9 @@ public class EssService { }); } + private String getContractPDFUrlFromEss(EssContract contract) { + EssPerson creator = orgManager.getSuperAdminOrThrow(contract.getCreatorOuId()); + return essClient.getContractPDFUrl(creator, contract.getEssContractId()); + } + } \ No newline at end of file