From 45c3298779bf78813952eb4c9ce3c362883f6b70 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 16 Jan 2024 17:03:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=90=84=E9=83=A8=E9=97=A8=E4=B8=BB=E5=8A=A8=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E6=B5=81=E7=A8=8B=E9=83=A8=E6=89=80=E8=81=94=E7=BB=9C?=
 =?UTF-8?q?=E4=BA=BA=E6=B1=87=E6=80=BB=E6=B2=A1=E6=95=B0=E6=8D=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsAnnualReportServiceImpl.java      | 6 +-----
 1 file changed, 1 insertion(+), 5 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 ac6cbf4d..377aa773 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
@@ -276,9 +276,6 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
             throw new JeroBootException("任务不存在");
         }
         String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId();
-        // 根据当前执行Id获取所有子执行Id
-        List<String> executionIdList = actFlowCommonService.getAllChildExecutionIds(executionId);
-        executionIdList.add(executionId);
         AnnualReportDataVO annualReportDataVO = new AnnualReportDataVO();
         // 使用流程引擎根据taskId找到流程实例Id
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
@@ -316,11 +313,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                 break;
             case CONTACT_USER_COLLECT:
                 wrapper.eq(ProcessEsAnnualReport::getContactUser, userId);
-                wrapper.eq(ProcessEsAnnualReport::getExecutionId, executionId);
                 break;
             case CONTACT_USER_LEADER_APPROVAL:
                 wrapper.eq(ProcessEsAnnualReport::getContactUserLeaderLeader, userId);
-                wrapper.in(ProcessEsAnnualReport::getExecutionId, executionIdList);
+                wrapper.in(ProcessEsAnnualReport::getExecutionId, executionId);
                 break;
             case STANDARD_ENGINEER_COLLECT:
                 break;