From ca6121b2054061917169fe26d4b63b6d3ac4368f Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Mon, 25 Nov 2024 01:57:05 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=9A=E7=AD=BE=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B,=E5=AD=98=E5=9C=A8=E6=9C=AA=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E7=9A=84=E5=AE=A1=E6=89=B9=E5=8D=B4=E6=98=BE=E7=A4=BA=E5=B7=B2?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/bpm/service/task/BpmProcessInstanceServiceImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
index 959a51664b..83f3dca0e0 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
@@ -520,7 +520,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
                 activityInstance -> activityInstance.getEndTime() != null
                         && ObjectUtil.equals(activityInstance.getActivityType(), BpmnXMLConstants.ELEMENT_SEQUENCE_FLOW));
         // 特殊：会签情况下，会有部分已完成（审批）、部分未完成（待审批），此时需要 finishedTaskActivityIds 移除掉
-        unfinishedTaskActivityIds.removeAll(finishedTaskActivityIds);
+        // unfinishedTaskActivityIds.removeAll(finishedTaskActivityIds);
+        finishedTaskActivityIds.removeAll(unfinishedTaskActivityIds);
         // 特殊：如果流程实例被拒绝，则需要计算是哪个活动节点。
         // 注意，只取最后一个。因为会存在多次拒绝的情况，拒绝驳回到指定节点
         Set<String> rejectTaskActivityIds = CollUtil.newHashSet();