From d17a906d7cc7ce54f47a63a2c679928fdd7b83f7 Mon Sep 17 00:00:00 2001 From: yanglin Date: Wed, 12 Feb 2025 18:10:48 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/nanopart/ess/server/ess/EssClient.java | 8 ++++---- .../ess/server/ess/controller/ApiController.java | 10 +++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java index c93b03cc..193268d8 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java @@ -226,9 +226,9 @@ public class EssClient implements InitializingBean { return response.getFlowResourceUrlInfos()[0].getResourceUrlInfos()[0].getUrl(); } - public String getContractSignUrlPC(EssPerson superAdmin, String essContractId, EssPerson signPerson) { + public String getContractSignUrlPC(String essContractId, EssPerson signPerson) { ChannelCreateOrganizationBatchSignUrlRequest request = new ChannelCreateOrganizationBatchSignUrlRequest(); - request.setAgent(agent(superAdmin)); + request.setAgent(agent(signPerson)); request.setFlowIds(new String[]{essContractId}); request.setOpenId(PersonOpenId.create(signPerson.getOuId(), signPerson.getPersonId()).toOpenId()); ChannelCreateOrganizationBatchSignUrlResponse response = exec(invocation() @@ -239,9 +239,9 @@ public class EssClient implements InitializingBean { return response.getSignUrl(); } - public String getContractSignUrlWeixinApp(EssPerson superAdmin, String essContractId, EssPerson signPerson) { + public String getContractSignUrlWeixinApp(String essContractId, EssPerson signPerson) { CreateSignUrlsRequest request = new CreateSignUrlsRequest(); - request.setAgent(agent(superAdmin)); + request.setAgent(agent(signPerson)); request.setFlowIds(new String[]{essContractId}); request.setOpenId(PersonOpenId.create(signPerson.getOuId(), signPerson.getPersonId()).toOpenId()); CreateSignUrlsResponse response = exec(invocation() diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/ApiController.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/ApiController.java index 6336875c..45583a09 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/ApiController.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/ApiController.java @@ -161,22 +161,18 @@ class ApiController implements EssApi { BizAssertions.assertNotNull(contract, "合同不存在: {}", request.getEssContractId()); EssPerson signPerson = essPersonDao.find(request.getOuId(), request.getPersonId(), false).orElse(null); BizAssertions.assertNotNull(signPerson, "当前签署人员未加入单位, 无法签署"); - //noinspection DataFlowIssue - EssPerson superAdmin = orgManager.getSuperAdminOrThrow(contract.getCreatorOuId()); String signUrl = ""; if (request.getUrlType() == GetContractSignUrlRequest.URLType.WEIXIN_APP) - //noinspection DataFlowIssue - signUrl = essClient.getContractSignUrlWeixinApp(superAdmin, request.getEssContractId(), signPerson); + signUrl = essClient.getContractSignUrlWeixinApp(request.getEssContractId(), signPerson); else if (request.getUrlType() == GetContractSignUrlRequest.URLType.PC) - //noinspection DataFlowIssue - signUrl = essClient.getContractSignUrlPC(superAdmin, request.getEssContractId(), signPerson); + signUrl = essClient.getContractSignUrlPC(request.getEssContractId(), signPerson); GetContractSignUrlResponse response = new GetContractSignUrlResponse(); response.setSignUrl(signUrl); return ApiResult.ok(response); } - @SuppressWarnings("DataFlowIssue") @Override + @SuppressWarnings("DataFlowIssue") public ApiResult getContractPDFUrl(DownloadSingedContractPdfRequest request) { EssContract contract = essContractDao