From 755b44b4cb6394583dc08c9964c363812425b361 Mon Sep 17 00:00:00 2001 From: yanglin Date: Thu, 13 Feb 2025 18:12:42 +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 --- .../nanopart/ess/server/ess/EssService.java | 20 ++++++++++++------- .../nanopart/ess/server/ess/OrgManager.java | 3 ++- 2 files changed, 15 insertions(+), 8 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 30936a27..e605cfc4 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 @@ -50,15 +50,17 @@ public class EssService { public void essAddSealAuthorization(AddSealAuthorizationRequest request) { SealAndPerson sealAndPerson = getSealAndPersonOrThrow(request); - if (sealAndPerson.getSealPerson().getIsAuthorized().isYes()) + EssSealPerson sealPerson = sealAndPerson.getSealPerson(); + if (sealPerson.getIsAuthorized().isYes()) return; - EssPerson essPerson = essPersonDao.find(sealAndPerson.getSealPerson().getOuId(), - sealAndPerson.getSealPerson().getPersonId()).orElse(null); - BizAssertions.assertNotNull(essPerson, "人员不存在: {}", sealAndPerson.getSealPerson().getPersonId()); + EssPerson essPerson = essPersonDao + .find(sealPerson.getOuId(), sealPerson.getPersonId()) + .orElse(null); + BizAssertions.assertNotNull(essPerson, "人员不存在: {}", sealPerson.getPersonId()); //noinspection DataFlowIssue BizAssertions.assertTrue(essPerson.getIsAuthorized().isYes(), "人员未加入单位, 无法授权"); EssPerson superAdmin = orgManager.getSuperAdminOrThrow(sealAndPerson.getSeal().getOuId()); - essClient.addSealAuthorization(superAdmin, sealAndPerson.getSeal(), sealAndPerson.getSealPerson()); + essClient.addSealAuthorization(superAdmin, sealAndPerson.getSeal(), sealPerson); orgManager.addSealAuthorization(request.getEssSealId(), request.getPersonId(), request.getOperatorPersonId()); } @@ -83,9 +85,13 @@ public class EssService { } public String getContractSignUrl(GetContractSignUrlRequest request) { - EssContract contract = essContractDao.find(request.getEssContractId()).orElse(null); + EssContract contract = essContractDao + .find(request.getEssContractId()) + .orElse(null); BizAssertions.assertNotNull(contract, "合同不存在: {}", request.getEssContractId()); - EssPerson signPerson = essPersonDao.find(request.getOuId(), request.getPersonId()).orElse(null); + EssPerson signPerson = essPersonDao + .find(request.getOuId(), request.getPersonId()) + .orElse(null); BizAssertions.assertNotNull(signPerson, "当前签署人员未加入单位, 无法签署"); String signUrl = ""; if (request.getUrlType() == GetContractSignUrlRequest.URLType.WEIXIN_APP) diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java index 6e04a10f..46ea2f32 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java @@ -99,7 +99,8 @@ public class OrgManager { if (org.getSuperAdminPersonId() <= 0L) return Optional.empty(); EssPerson person = essPersonDao - .find(ouId, org.getSuperAdminPersonId()).orElse(null); + .find(ouId, org.getSuperAdminPersonId()) + .orElse(null); return Optional.ofNullable(person); }