From 8bf209caba767ba998ba010e020da2e794785faf Mon Sep 17 00:00:00 2001 From: yanglin Date: Thu, 13 Feb 2025 18:11:56 +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 --- .../java/cn/axzo/nanopart/ess/server/dao/EssPersonDao.java | 4 ++++ .../java/cn/axzo/nanopart/ess/server/ess/ContractManager.java | 2 +- .../main/java/cn/axzo/nanopart/ess/server/ess/EssService.java | 4 ++-- .../main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java | 2 +- .../java/cn/axzo/nanopart/ess/server/ess/QueryService.java | 3 +-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssPersonDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssPersonDao.java index fd88d6e5..db4ad3ee 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssPersonDao.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssPersonDao.java @@ -18,6 +18,10 @@ import java.util.Optional; @Repository("essPersonDao") public class EssPersonDao extends ServiceImpl { + public Optional find(Long ouId, Long personId) { + return find(ouId, personId, false); + } + public Optional find(Long ouId, Long personId, boolean forUpdate) { return lambdaQuery() .eq(EssPerson::getOuId, ouId) diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java index dc2b8fae..7836bb67 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java @@ -134,7 +134,7 @@ public class ContractManager { private EssPerson getContractCreatorOrThrow(EssContract contract) { EssPerson creator = essPersonDao - .find(contract.getCreatorOuId(), contract.getCreatorPersonId(), false) + .find(contract.getCreatorOuId(), contract.getCreatorPersonId()) .orElse(null); BizAssertions.assertNotNull(creator, "找不到合同发起人信息"); return creator; 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 48a712ac..30936a27 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 @@ -53,7 +53,7 @@ public class EssService { if (sealAndPerson.getSealPerson().getIsAuthorized().isYes()) return; EssPerson essPerson = essPersonDao.find(sealAndPerson.getSealPerson().getOuId(), - sealAndPerson.getSealPerson().getPersonId(), false).orElse(null); + sealAndPerson.getSealPerson().getPersonId()).orElse(null); BizAssertions.assertNotNull(essPerson, "人员不存在: {}", sealAndPerson.getSealPerson().getPersonId()); //noinspection DataFlowIssue BizAssertions.assertTrue(essPerson.getIsAuthorized().isYes(), "人员未加入单位, 无法授权"); @@ -85,7 +85,7 @@ public class EssService { public String getContractSignUrl(GetContractSignUrlRequest request) { EssContract contract = essContractDao.find(request.getEssContractId()).orElse(null); BizAssertions.assertNotNull(contract, "合同不存在: {}", request.getEssContractId()); - EssPerson signPerson = essPersonDao.find(request.getOuId(), request.getPersonId(), false).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 dd020110..6e04a10f 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,7 @@ public class OrgManager { if (org.getSuperAdminPersonId() <= 0L) return Optional.empty(); EssPerson person = essPersonDao - .find(ouId, org.getSuperAdminPersonId(), false).orElse(null); + .find(ouId, org.getSuperAdminPersonId()).orElse(null); return Optional.ofNullable(person); } diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java index 44191ae9..0b7aaf63 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java @@ -12,7 +12,6 @@ import cn.axzo.nanopart.ess.api.request.GetSealsRequest; import cn.axzo.nanopart.ess.api.request.GetUnitAuthStatesRequest; import cn.axzo.nanopart.ess.api.response.GetPersonAuthStateResponse; import cn.axzo.nanopart.ess.api.response.GetUnitAuthStatesResponse; -import cn.axzo.nanopart.ess.server.dao.EssContractDao; import cn.axzo.nanopart.ess.server.dao.EssOrgDao; import cn.axzo.nanopart.ess.server.dao.EssPersonDao; import cn.axzo.nanopart.ess.server.dao.EssSealDao; @@ -78,7 +77,7 @@ public class QueryService { public GetPersonAuthStateResponse getPersonAuthState(GetPersonAuthStateRequest request) { EssPerson person = essPersonDao - .find(request.getOuId(), request.getPersonId(), false) + .find(request.getOuId(), request.getPersonId()) .orElse(null); GetPersonAuthStateResponse response = new GetPersonAuthStateResponse(); response.setAuthorized(person != null && person.getIsAuthorized().isYes());