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:11:56 +08:00
parent d50e832ff1
commit 8bf209caba
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssPersonDao.java
View File

@ -18,6 +18,10 @@ import java.util.Optional;
@Repository("essPersonDao") @Repository("essPersonDao")
public class EssPersonDao extends ServiceImpl<EssPersonMapper, EssPerson> { public class EssPersonDao extends ServiceImpl<EssPersonMapper, EssPerson> {
public Optional<EssPerson> find(Long ouId, Long personId) {
return find(ouId, personId, false);
}
public Optional<EssPerson> find(Long ouId, Long personId, boolean forUpdate) { public Optional<EssPerson> find(Long ouId, Long personId, boolean forUpdate) {
return lambdaQuery() return lambdaQuery()
.eq(EssPerson::getOuId, ouId) .eq(EssPerson::getOuId, ouId)

2
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java
View File

@ -134,7 +134,7 @@ public class ContractManager {
private EssPerson getContractCreatorOrThrow(EssContract contract) { private EssPerson getContractCreatorOrThrow(EssContract contract) {
EssPerson creator = essPersonDao EssPerson creator = essPersonDao
.find(contract.getCreatorOuId(), contract.getCreatorPersonId(), false) .find(contract.getCreatorOuId(), contract.getCreatorPersonId())
.orElse(null); .orElse(null);
BizAssertions.assertNotNull(creator, "找不到合同发起人信息"); BizAssertions.assertNotNull(creator, "找不到合同发起人信息");
return creator; return creator;

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

@ -53,7 +53,7 @@ public class EssService {
if (sealAndPerson.getSealPerson().getIsAuthorized().isYes()) if (sealAndPerson.getSealPerson().getIsAuthorized().isYes())
return; return;
EssPerson essPerson = essPersonDao.find(sealAndPerson.getSealPerson().getOuId(), EssPerson essPerson = essPersonDao.find(sealAndPerson.getSealPerson().getOuId(),
sealAndPerson.getSealPerson().getPersonId(), false).orElse(null); sealAndPerson.getSealPerson().getPersonId()).orElse(null);
BizAssertions.assertNotNull(essPerson, "人员不存在: {}", sealAndPerson.getSealPerson().getPersonId()); BizAssertions.assertNotNull(essPerson, "人员不存在: {}", sealAndPerson.getSealPerson().getPersonId());
//noinspection DataFlowIssue //noinspection DataFlowIssue
BizAssertions.assertTrue(essPerson.getIsAuthorized().isYes(), "人员未加入单位, 无法授权"); BizAssertions.assertTrue(essPerson.getIsAuthorized().isYes(), "人员未加入单位, 无法授权");
@ -85,7 +85,7 @@ public class EssService {
public String getContractSignUrl(GetContractSignUrlRequest request) { 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()); 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, "当前签署人员未加入单位, 无法签署"); BizAssertions.assertNotNull(signPerson, "当前签署人员未加入单位, 无法签署");
String signUrl = ""; String signUrl = "";
if (request.getUrlType() == GetContractSignUrlRequest.URLType.WEIXIN_APP) if (request.getUrlType() == GetContractSignUrlRequest.URLType.WEIXIN_APP)

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

@ -99,7 +99,7 @@ public class OrgManager {
if (org.getSuperAdminPersonId() <= 0L) if (org.getSuperAdminPersonId() <= 0L)
return Optional.empty(); return Optional.empty();
EssPerson person = essPersonDao EssPerson person = essPersonDao
.find(ouId, org.getSuperAdminPersonId(), false).orElse(null); .find(ouId, org.getSuperAdminPersonId()).orElse(null);
return Optional.ofNullable(person); return Optional.ofNullable(person);
} }

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

@ -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.request.GetUnitAuthStatesRequest;
import cn.axzo.nanopart.ess.api.response.GetPersonAuthStateResponse; import cn.axzo.nanopart.ess.api.response.GetPersonAuthStateResponse;
import cn.axzo.nanopart.ess.api.response.GetUnitAuthStatesResponse; 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.EssOrgDao;
import cn.axzo.nanopart.ess.server.dao.EssPersonDao; import cn.axzo.nanopart.ess.server.dao.EssPersonDao;
import cn.axzo.nanopart.ess.server.dao.EssSealDao; import cn.axzo.nanopart.ess.server.dao.EssSealDao;
@ -78,7 +77,7 @@ public class QueryService {
public GetPersonAuthStateResponse public GetPersonAuthStateResponse
getPersonAuthState(GetPersonAuthStateRequest request) { getPersonAuthState(GetPersonAuthStateRequest request) {
EssPerson person = essPersonDao EssPerson person = essPersonDao
.find(request.getOuId(), request.getPersonId(), false) .find(request.getOuId(), request.getPersonId())
.orElse(null); .orElse(null);
GetPersonAuthStateResponse response = new GetPersonAuthStateResponse(); GetPersonAuthStateResponse response = new GetPersonAuthStateResponse();
response.setAuthorized(person != null && person.getIsAuthorized().isYes()); response.setAuthorized(person != null && person.getIsAuthorized().isYes());