From a09c700eb9d951c364d69c9a4e9cd18920645aee Mon Sep 17 00:00:00 2001 From: fengjiajie Date: Wed, 12 Mar 2025 00:17:43 +0800 Subject: [PATCH] =?UTF-8?q?update(bpm):=20=E5=8F=91=E8=B5=B7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=AE=9E=E4=BE=8B=E6=97=B6=E4=B8=8D=E5=86=8D=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=8F=91=E8=B5=B7=E4=BA=BA=E8=87=AA=E9=80=89=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dept/BpmTaskCandidateStartUserSelectStrategy.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategy.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategy.java index 9fd14d6de..11cd53017 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategy.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategy.java @@ -51,10 +51,14 @@ public class BpmTaskCandidateStartUserSelectStrategy extends AbstractBpmTaskCand ProcessInstance processInstance = processInstanceService.getProcessInstance(execution.getProcessInstanceId()); Assert.notNull(processInstance, "流程实例({})不能为空", execution.getProcessInstanceId()); Map> startUserSelectAssignees = FlowableUtils.getStartUserSelectAssignees(processInstance); - Assert.notNull(startUserSelectAssignees, "流程实例({}) 的发起人自选审批人不能为空", - execution.getProcessInstanceId()); + if (startUserSelectAssignees == null) { + return Sets.newLinkedHashSet(); + } // 获得审批人 List assignees = startUserSelectAssignees.get(execution.getCurrentActivityId()); + if (CollUtil.isEmpty(assignees)){ + return Sets.newLinkedHashSet(); + } return new LinkedHashSet<>(assignees); } @@ -70,6 +74,9 @@ public class BpmTaskCandidateStartUserSelectStrategy extends AbstractBpmTaskCand } // 获得审批人 List assignees = startUserSelectAssignees.get(activityId); + if (CollUtil.isEmpty(assignees)){ + return Sets.newLinkedHashSet(); + } return new LinkedHashSet<>(assignees); }