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-26 16:45:23 +08:00
parent 911cb2d078
commit 07f7756be6
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/Approver.java
View File

@ -73,7 +73,7 @@ public class Approver implements OrgPerson {
return internal; return internal;
} }
public boolean isSignPersonPresent() { public boolean isSignPersonPreset() {
return signPerson != null; return signPerson != null;
} }

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

@ -18,7 +18,6 @@ import lombok.Setter;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.List; import java.util.List;
import java.util.Optional;
/** /**
* @author yanglin * @author yanglin
@ -166,7 +165,7 @@ public class EssContract extends BaseEntity<EssContract> {
public boolean isApproversPreset() { public boolean isApproversPreset() {
if (approvers == null) if (approvers == null)
return false; return false;
return approvers.stream().allMatch(Approver::isSignPersonPresent); return approvers.stream().allMatch(Approver::isSignPersonPreset);
} }
public boolean shouldDownloadContract() { public boolean shouldDownloadContract() {

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

@ -212,12 +212,12 @@ public class EssClient implements InitializingBean {
String customerData) throws TencentCloudSDKException { String customerData) throws TencentCloudSDKException {
OrgProfiles orgProfiles = OrgProfiles.wrap(essSupport OrgProfiles orgProfiles = OrgProfiles.wrap(essSupport
.getOrgProfiles(contract.getApprovers().stream() .getOrgProfiles(contract.getApprovers().stream()
.filter(Approver::isSignPersonPresent) .filter(Approver::isSignPersonPreset)
.map(Approver::getOuId) .map(Approver::getOuId)
.collect(toList()))); .collect(toList())));
PersonProfiles personProfiles = PersonProfiles.wrap(essSupport PersonProfiles personProfiles = PersonProfiles.wrap(essSupport
.getPersonProfiles(contract.getApprovers().stream() .getPersonProfiles(contract.getApprovers().stream()
.filter(Approver::isSignPersonPresent) .filter(Approver::isSignPersonPreset)
.map(Approver::getPersonId) .map(Approver::getPersonId)
.collect(toList()))); .collect(toList())));
ArrayList<FlowApproverInfo> approvers = new ArrayList<>(); ArrayList<FlowApproverInfo> approvers = new ArrayList<>();