From 07f7756be61c584b7c913eb92562e5e1358078ab Mon Sep 17 00:00:00 2001 From: yanglin Date: Wed, 26 Feb 2025 16:45:23 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E8=AF=A5=E7=AD=BE=E7=BD=B2?= =?UTF-8?q?=E4=BD=8D=E5=B7=B2=E7=AD=BE=E7=BD=B2,=20=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E7=AD=BE=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/nanopart/ess/api/domain/contract/Approver.java | 2 +- .../java/cn/axzo/nanopart/ess/server/entity/EssContract.java | 3 +-- .../main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/Approver.java b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/Approver.java index 7a09bad9..0eaa460f 100644 --- a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/Approver.java +++ b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/Approver.java @@ -73,7 +73,7 @@ public class Approver implements OrgPerson { return internal; } - public boolean isSignPersonPresent() { + public boolean isSignPersonPreset() { return signPerson != null; } diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java index d64a72a3..89ebf7c0 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java @@ -18,7 +18,6 @@ import lombok.Setter; import org.apache.commons.lang3.StringUtils; import java.util.List; -import java.util.Optional; /** * @author yanglin @@ -166,7 +165,7 @@ public class EssContract extends BaseEntity { public boolean isApproversPreset() { if (approvers == null) return false; - return approvers.stream().allMatch(Approver::isSignPersonPresent); + return approvers.stream().allMatch(Approver::isSignPersonPreset); } public boolean shouldDownloadContract() { diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java index 4b77a46d..eed17cad 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java @@ -212,12 +212,12 @@ public class EssClient implements InitializingBean { String customerData) throws TencentCloudSDKException { OrgProfiles orgProfiles = OrgProfiles.wrap(essSupport .getOrgProfiles(contract.getApprovers().stream() - .filter(Approver::isSignPersonPresent) + .filter(Approver::isSignPersonPreset) .map(Approver::getOuId) .collect(toList()))); PersonProfiles personProfiles = PersonProfiles.wrap(essSupport .getPersonProfiles(contract.getApprovers().stream() - .filter(Approver::isSignPersonPresent) + .filter(Approver::isSignPersonPreset) .map(Approver::getPersonId) .collect(toList()))); ArrayList approvers = new ArrayList<>();