From 70ec28d1958602df0d35687bc93d3af808ad7741 Mon Sep 17 00:00:00 2001 From: yanglin Date: Tue, 4 Mar 2025 17:52:32 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E6=8E=88=E6=9D=83=E4=BA=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axzo/nanopart/ess/server/entity/domain/SignPerOrgs.java | 5 +++++ .../java/cn/axzo/nanopart/ess/server/ess/EssService.java | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/domain/SignPerOrgs.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/domain/SignPerOrgs.java index ce606111..7a02ef3a 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/domain/SignPerOrgs.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/domain/SignPerOrgs.java @@ -24,6 +24,11 @@ public class SignPerOrgs { .findFirst(); } + public void upsert(OrgPerson person, String recipientId) { + remove(person.getOuId()); + add(person, recipientId); + } + public void remove(Long ouId) { signPerOrg.removeIf(org -> org.getOuId().equals(ouId)); } 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 dd2ee6fa..0c8beac4 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 @@ -148,8 +148,7 @@ public class EssService { signPerson); } }); - contract.getOrCreateAssignment().getSignPerOrgs().remove(request.getOuId()); - contract.getOrCreateAssignment().getSignPerOrgs().add(signPerson, request.getRecipientId()); + contract.getOrCreateAssignment().getSignPerOrgs().upsert(signPerson, request.getRecipientId()); essContractDao.updateAssigment(contract); } EssPerson superAdmin = contractManager.getContractSuperAdmin(contract);