wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-3581: 备份

Browse Source
This commit is contained in:
yanglin 2025-02-13 18:12:42 +08:00
parent 8bf209caba
commit 755b44b4cb
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java
View File

@ -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)

3
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java
View File

@ -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);
}