From c80f57a0fe319275bcc4d26c5fb6824ae5b3f98d Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 24 Sep 2024 20:33:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-2924)=20-=20=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E7=A6=BB=E8=81=8C=E7=9A=84=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../delegate/BasedFixedPersonTaskAssigneeSelector.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedFixedPersonTaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedFixedPersonTaskAssigneeSelector.java
index aba25252e..ddda169b8 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedFixedPersonTaskAssigneeSelector.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedFixedPersonTaskAssigneeSelector.java
@@ -72,7 +72,9 @@ public class BasedFixedPersonTaskAssigneeSelector extends AbstractBpmnTaskAssign
                 "cn.axzo.maokai.api.client.OrganizationalNodeUserApi.list", searchReq);
 
         // 只要有在职的人，不会走审批人为空
-        if (ListUtils.emptyIfNull(onlineUsers).stream().anyMatch(i -> Objects.equals(i.getIsDelete(), 0L))) {
+        if (ListUtils.emptyIfNull(onlineUsers).stream().filter(i -> Objects.equals(i.getIsDelete(), 0L))
+                .anyMatch(u-> assigners.stream().anyMatch(i-> Objects.equals(i.getPersonId(), String.valueOf(u.getPersonId()))
+                        && Objects.equals(i.getOuId(), String.valueOf(u.getOrganizationalUnitId()))))) {
             return assigners;
         }