From 12cc50109cacfbdc0fc013e6c2314e433bf6bbb1 Mon Sep 17 00:00:00 2001 From: lbw Date: Wed, 27 Dec 2023 15:13:00 +0800 Subject: [PATCH] =?UTF-8?q?bug=20fix=20=E9=BB=98=E8=AE=A4=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E4=BA=BA=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/listeners/FlowProcessEventListener.java | 4 ++-- .../pigx/flow/engine/node/MultiInstanceHandler.java | 11 ++++------- .../pigx/flow/task/utils/NodeFormatUtil.java | 4 ++++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/listeners/FlowProcessEventListener.java b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/listeners/FlowProcessEventListener.java index d3a91fbc5..84ae9760c 100644 --- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/listeners/FlowProcessEventListener.java +++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/listeners/FlowProcessEventListener.java @@ -184,7 +184,7 @@ public class FlowProcessEventListener implements FlowableEventListener { processNodeRecordAssignUserParamDto .setLocalData(objectMapper.writeValueAsString(taskService.getVariablesLocal(task.getId()))); processNodeRecordAssignUserParamDto.setNodeId(taskDefinitionKey); - processNodeRecordAssignUserParamDto.setUserId(Long.parseLong(assignee)); + processNodeRecordAssignUserParamDto.setUserId(Long.parseLong(task.getAssignee())); processNodeRecordAssignUserParamDto.setTaskId(task.getId()); processNodeRecordAssignUserParamDto.setNodeName(task.getName()); processNodeRecordAssignUserParamDto.setTaskType("COMPLETE"); @@ -219,7 +219,7 @@ public class FlowProcessEventListener implements FlowableEventListener { processNodeRecordAssignUserParamDto.setProcessInstanceId(processInstanceId); // processNodeRecordAssignUserParamDto.setData(); processNodeRecordAssignUserParamDto.setNodeId(taskDefinitionKey); - processNodeRecordAssignUserParamDto.setUserId(Long.parseLong(assignee)); + processNodeRecordAssignUserParamDto.setUserId(Long.parseLong(task.getAssignee())); processNodeRecordAssignUserParamDto.setTaskId(task.getId()); processNodeRecordAssignUserParamDto.setNodeName(task.getName()); processNodeRecordAssignUserParamDto diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/node/MultiInstanceHandler.java b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/node/MultiInstanceHandler.java index 49d90ee9e..7b864c614 100644 --- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/node/MultiInstanceHandler.java +++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/node/MultiInstanceHandler.java @@ -20,7 +20,6 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Optional; @Slf4j @RequiredArgsConstructor @@ -79,12 +78,10 @@ public class MultiInstanceHandler { } } - Optional.of(assignList).orElseGet(() -> { - List defaultList = new ArrayList<>(); - defaultList.add(ProcessInstanceConstant.DEFAULT_EMPTY_ASSIGN); - return defaultList; - }); - + // 标记为空 + if (CollUtil.isEmpty(assignList)) { + assignList.add(ProcessInstanceConstant.DEFAULT_EMPTY_ASSIGN); + } return assignList; } diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/utils/NodeFormatUtil.java b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/utils/NodeFormatUtil.java index 1b6375e28..ce7a8866b 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/utils/NodeFormatUtil.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/utils/NodeFormatUtil.java @@ -252,6 +252,10 @@ public class NodeFormatUtil { * @return */ private static UserVo buildUser(long userId) { + if (ProcessInstanceConstant.DEFAULT_EMPTY_ASSIGN == userId){ + return UserVo.builder().id(userId).build(); + } + RemoteUserService userService = SpringUtil.getBean(RemoteUserService.class); SysUser user = userService.getUserById(userId).getData(); if (user == null) {