diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java index f91779c87..d320e290e 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java @@ -153,20 +153,20 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< PROCESS_PUSH_PENDING, event, collectionVariable(event)); List buttons = new ArrayList<>(); - // TODO 发送待办时, 计算当前人能操作的按钮有哪些? + // 发送待办时, 计算当前人能操作的按钮有哪些? if (StringUtils.hasText(event.getProcessDefinitionId())) { BpmnTaskDelegateAssigner bpmnTaskDelegateAssigner = event.getAssigners().get(0); Process process = getContext().getProcess(() -> ProcessDefinitionUtil.getBpmnModel(event.getProcessDefinitionId()).getMainProcess()); BpmnMetaParserHelper.getButtonConfig(process, event.getCurrentTaskDefinitionKey()) .ifPresent(buttonConf -> { BpmnProcessInstanceVO instance = getContext().getInstanceVO(() -> getBpmnProcessInstanceVO(event)); - if (bpmnTaskDelegateAssigner.comparePersonIdToOther(instance.getStartUserId())) { + if (bpmnTaskDelegateAssigner.comparePersonIdToOther(instance.getInitiator())) { buttons.addAll(buttonConf.getInitiator()); } buttons.addAll(buttonConf.getCurrent()); }); } - + dto.setButtons(buttons); sendMessageQueue(dto, PROCESS_PUSH_PENDING); } if (log.isDebugEnabled()) {