From 7a36f754e44bf9769244c981db02964d6523176a Mon Sep 17 00:00:00 2001 From: yanglin Date: Thu, 13 Feb 2025 15:50:36 +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 --- .../axzo/nanopart/ess/server/ess/EssService.java | 10 ---------- .../axzo/nanopart/ess/server/ess/OrgManager.java | 14 +++++++++++--- .../ess/server/ess/controller/ApiController.java | 11 ++++------- 3 files changed, 15 insertions(+), 20 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 d48498c0..64b1cdb4 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 @@ -7,7 +7,6 @@ import cn.axzo.nanopart.ess.api.request.DownloadSingedContractPdfRequest; import cn.axzo.nanopart.ess.api.request.GetContractSignUrlRequest; import cn.axzo.nanopart.ess.api.request.GetEmbedWebUrlRequest; import cn.axzo.nanopart.ess.api.request.RemoveSealAuthorizationRequest; -import cn.axzo.nanopart.ess.api.request.RemoveSealPersonRequest; import cn.axzo.nanopart.ess.api.request.SealAndPersonRequest; import cn.axzo.nanopart.ess.server.dao.EssContractDao; import cn.axzo.nanopart.ess.server.dao.EssPersonDao; @@ -50,15 +49,6 @@ public class EssService { authPerson, request.getEmbedType(), request.getBusinessId()); } - public void removeSealPerson(RemoveSealPersonRequest request) { - EssSeal seal = essSealDao.findByEssSealId(request.getEssSealId()).orElse(null); - BizAssertions.assertNotNull(seal, "印章不存在: {}", request.getEssSealId()); - //noinspection DataFlowIssue - EssPerson superAdmin = orgManager.getSuperAdminOrThrow(seal.getOuId()); - BizAssertions.assertFalse(superAdmin.getPersonId().equals(request.getPersonId()), "不能从印章列表删除超级管理员"); - orgManager.removeSealPerson(request.getEssSealId(), request.getPersonId()); - } - public void essAddSealAuthorization(AddSealAuthorizationRequest request) { SealAndPerson sealAndPerson = getSealAndPersonOrThrow(request); if (sealAndPerson.getSealPerson().getIsAuthorized().isYes()) 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 cd406ae4..dd020110 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 @@ -3,6 +3,7 @@ package cn.axzo.nanopart.ess.server.ess; import cn.axzo.nanopart.ess.api.enums.EssSealState; import cn.axzo.nanopart.ess.api.enums.EssSealType; import cn.axzo.nanopart.ess.api.request.CreateConsoleLoginUrlRequest; +import cn.axzo.nanopart.ess.api.request.RemoveSealPersonRequest; import cn.axzo.nanopart.ess.server.dao.EssOrgDao; import cn.axzo.nanopart.ess.server.dao.EssPersonDao; import cn.axzo.nanopart.ess.server.dao.EssSealDao; @@ -162,9 +163,16 @@ public class OrgManager { } @Transactional - public void removeSealPerson(String essSealId, Long personId) { - EssSealPerson sealPerson = essSealPersonDao.find(essSealId, personId, true).orElse(null); - BizAssertions.assertNotNull(sealPerson, "印章人员不存在: {}, {}", essSealId, personId); + public void tryRemoveSealPerson(RemoveSealPersonRequest request) { + EssSeal seal = essSealDao.findByEssSealId(request.getEssSealId()).orElse(null); + BizAssertions.assertNotNull(seal, "印章不存在: {}", request.getEssSealId()); + //noinspection DataFlowIssue + EssPerson superAdmin = getSuperAdminOrThrow(seal.getOuId()); + BizAssertions.assertFalse(superAdmin.getPersonId().equals(request.getPersonId()), "不能从印章列表删除超级管理员"); + EssSealPerson sealPerson = essSealPersonDao + .find(seal.getEssSealId(), request.getPersonId(), true) + .orElse(null); + BizAssertions.assertNotNull(sealPerson, "印章人员不存在"); //noinspection DataFlowIssue BizAssertions.assertTrue(sealPerson.getIsAuthorized().isNo(), "请先取消授权再删除"); essSealPersonDao.removeById(sealPerson.getId()); 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 878f3f09..0b8e9ade 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 @@ -55,19 +55,16 @@ class ApiController implements EssApi { private final EssService essService; @Override - public ApiResult> - getUnitAuthStates(GetUnitAuthStatesRequest request) { + public ApiResult> getUnitAuthStates(GetUnitAuthStatesRequest request) { return ApiResult.ok(queryService.getEssUnitAuthStates(request)); } - @Override public ApiResult - getPersonAuthState(GetPersonAuthStateRequest request) { + @Override public ApiResult getPersonAuthState(GetPersonAuthStateRequest request) { return ApiResult.ok(queryService.getPersonAuthState(request)); } @Override - public ApiResult - createConsoleLoginUrl(CreateConsoleLoginUrlRequest request) { + public ApiResult createConsoleLoginUrl(CreateConsoleLoginUrlRequest request) { CreateConsoleLoginUrlResponse response = new CreateConsoleLoginUrlResponse(); response.setConsoleLoginUrl(essService.createConsoleLoginUrl(request)); return ApiResult.ok(response); @@ -93,7 +90,7 @@ class ApiController implements EssApi { @Override public ApiResult removeSealPerson(RemoveSealPersonRequest request) { - essService.removeSealPerson(request); + orgManager.tryRemoveSealPerson(request); return ApiResult.ok(); }