zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-08 04:39:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug fix 默认执行人为空的逻辑错误

Browse Source
This commit is contained in:
lbw committed 2024-02-20 13:31:29 +08:00
1 parent e159602711
commit 12cc50109c
3 files changed
+10 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/listeners/FlowProcessEventListener.java
+2 -2
View File
@@ -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
pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/node/MultiInstanceHandler.java
+4 -7
View File
@@ -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<Long> defaultList = new ArrayList<>();
defaultList.add(ProcessInstanceConstant.DEFAULT_EMPTY_ASSIGN);
return defaultList;
});
// 标记为空
if (CollUtil.isEmpty(assignList)) {
assignList.add(ProcessInstanceConstant.DEFAULT_EMPTY_ASSIGN);
}
return assignList;
}
pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/utils/NodeFormatUtil.java
+4
View File
@@ -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) {