From eb757bebb472c6d38d734505d16eb4faf0d82a3b Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 5 Feb 2024 20:19:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081798=20=E5=B9=B4=E5=BA=A6=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92(=E5=90=84=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E4=B8=BB=E5=8A=A8=E4=B8=8A=E6=8A=A5)=EF=BC=88?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86=E8=81=94=E7=BB=9C=E4=BA=BA=E4=B8=BB=E7=AE=A1?=
 =?UTF-8?q?=E7=BA=A7=E9=A2=86=E5=AF=BC=E5=AE=A1=E6=89=B9=E3=80=81=E5=90=84?=
 =?UTF-8?q?=E9=83=A8=E6=89=80=E8=81=94=E7=BB=9C=E4=BA=BA=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=EF=BC=89=20=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9C=89?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E7=8E=B0=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsAnnualReportServiceImpl.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index 72661e5e..3f08bc16 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
@@ -243,10 +243,12 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                 break;
             case WORK_GROUP_COLLECT:
                 // 先删后增
+                AnnualReportDataVO handleData = this.getHandleData(taskId);
+                List<ProcessEsAnnualReport> handaleDataList = handleData.getDataList();
+                List<String> idList = new ArrayList<>();
+                handaleDataList.forEach(h -> idList.add(h.getId()));
                 wrapper.eq(ProcessEsAnnualReport::getWorkGroupUser, workGroupUser);
-                wrapper.eq(ProcessEsAnnualReport::getContactUser, contactUser);
-                wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
-                remove(wrapper);
+                removeByIds(idList);
                 annualReport = annualReportDataVO.getDataList().get(0);
                 String collectUserLeader = annualReport.getCollectUserLeader();
                 contactUserLeaderLeader = annualReport.getContactUserLeaderLeader();