From e613d5b2e091527f6c62f7d069a3c5bec70b18e0 Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Tue, 6 Aug 2024 09:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2=EF=BC=8C=20=E5=89=94=E9=99=A4?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=AE=A1=E6=89=B9=E5=BE=97=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bpm/service/task/BpmTaskServiceImpl.java  | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
index e1820945..310b8262 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
@@ -303,26 +303,16 @@ public class BpmTaskServiceImpl implements BpmTaskService {
 
         // 获得 TaskExtDO Map
         List<BpmTaskExtDO> bpmTaskExtDOs = taskExtMapper.selectListByTaskIds(convertSet(tasks, HistoricTaskInstance::getId));
-//        List<BpmTaskExtDO> bpmTaskExtDOsTemp = taskExtMapper.selectListByTaskIds(convertSet(tasks, HistoricTaskInstance::getId));
-        /** 剔除自动审批的Task记录  add by yj at 2024.1.23 Begin*/
-//        List<BpmTaskExtDO> bpmTaskExtDOs = new ArrayList<>() ;
-//        List<HistoricTaskInstance> tasksAfter = new ArrayList<>() ;
-//        for (BpmTaskExtDO bpmTaskExtDO : bpmTaskExtDOsTemp) {
-//            String reason = bpmTaskExtDO.getReason() ;
-//            if(!BpmConstants.AUTO_APPRAVAL.equals(reason)) {
-//                bpmTaskExtDOs.add(bpmTaskExtDO) ;
-//                String taskId = bpmTaskExtDO.getTaskId() ;
-//                for (HistoricTaskInstance historicTaskInstance : tasks) {
-//                    String id= historicTaskInstance.getId() ;
-//                    if(taskId.equals( id )) {
-//                        tasksAfter.add(historicTaskInstance) ;
-//                        break ;
-//                    }
-//                }
-//            }
-//        }
-//        tasks = tasksAfter ;
-        /** 剔除自动审批的Task记录  add by yj at 2024.1.23 End*/
+
+        /* 剔除自动审批的Task记录  Begin */
+        bpmTaskExtDOs = bpmTaskExtDOs.stream()
+                .filter(bpmTaskExtDO -> !BpmConstants.AUTO_APPRAVAL.equals(bpmTaskExtDO.getReason()) || BpmConstants.SELF_TASK_NAME.equals(bpmTaskExtDO.getName()))
+                .collect(Collectors.toList());
+
+        List<String> taskIds = convertList(bpmTaskExtDOs, BpmTaskExtDO::getTaskId);
+        tasks = tasks.stream().filter(task -> taskIds.contains(task.getId())).collect(Collectors.toList());
+        /* 剔除自动审批的Task记录  End */
+
         Map<String, BpmTaskExtDO> bpmTaskExtDOMap = convertMap(bpmTaskExtDOs, BpmTaskExtDO::getTaskId);
         // 获得 ProcessInstance Map
         HistoricProcessInstance processInstance = processInstanceService.getHistoricProcessInstance(processInstanceId);