Commit dadd43677eb90d5df6929030b960b59174c946f6
1 parent
6e2d00d5
review: 51行
Showing
1 changed file
with
5 additions
and
0 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateApproveUserSelectStrategy.java
| ... | ... | @@ -50,6 +50,9 @@ public class BpmTaskCandidateApproveUserSelectStrategy extends AbstractBpmTaskCa |
| 50 | 50 | Map<String, List<Long>> approveUserSelectAssignees = FlowableUtils.getApproveUserSelectAssignees(processInstance); |
| 51 | 51 | Assert.notNull(approveUserSelectAssignees, "流程实例({}) 的下一个执行节点审批人不能为空", |
| 52 | 52 | execution.getProcessInstanceId()); |
| 53 | + if (approveUserSelectAssignees == null) { | |
| 54 | + return Sets.newLinkedHashSet(); | |
| 55 | + } | |
| 53 | 56 | // 获得审批人 |
| 54 | 57 | List<Long> assignees = approveUserSelectAssignees.get(execution.getCurrentActivityId()); |
| 55 | 58 | return CollUtil.isNotEmpty(assignees) ? new LinkedHashSet<>(assignees) : Sets.newLinkedHashSet(); |
| ... | ... | @@ -62,6 +65,8 @@ public class BpmTaskCandidateApproveUserSelectStrategy extends AbstractBpmTaskCa |
| 62 | 65 | return Sets.newLinkedHashSet(); |
| 63 | 66 | } |
| 64 | 67 | Map<String, List<Long>> approveUserSelectAssignees = FlowableUtils.getApproveUserSelectAssignees(processVariables); |
| 68 | + Assert.notNull(approveUserSelectAssignees, "流程实例节点({}) 的下一个执行节点审批人不能为空", | |
| 69 | + activityId); | |
| 65 | 70 | if (approveUserSelectAssignees == null) { |
| 66 | 71 | return Sets.newLinkedHashSet(); |
| 67 | 72 | } | ... | ... |