wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-4586) - 调整审批人冗余相信内容，防止消费时出现 NPE

Browse Source
This commit is contained in:
wangli 2025-07-14 14:49:38 +08:00
parent 439ef6ef4d
commit f8678ad02a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java
View File

@ -563,6 +563,8 @@ public class BpmnProcessInstanceController extends BasicPopulateAvatarController
if (Objects.isNull(dto.getStatus())) { if (Objects.isNull(dto.getStatus())) {
query.setStatus(BpmnProcessInstanceResultEnum.PROCESSING.getStatus()); query.setStatus(BpmnProcessInstanceResultEnum.PROCESSING.getStatus());
} else {
query.setStatus(dto.getStatus().getStatus());
} }
List<ExtAxProcessLog> extAxProcessLogs = extAxProcessLogService.genericQuery(query); List<ExtAxProcessLog> extAxProcessLogs = extAxProcessLogService.genericQuery(query);
return success(ListUtils.emptyIfNull(extAxProcessLogs).stream().map(i -> { return success(ListUtils.emptyIfNull(extAxProcessLogs).stream().map(i -> {

7
workflow-engine-server/src/main/java/cn/axzo/workflow/server/engine/ext/listener/TaskEntityEventHandle.java
View File

@ -190,8 +190,9 @@ public class TaskEntityEventHandle implements EntityEventHandle<TaskEntity> {
.map(i -> JobInfo.builder() .map(i -> JobInfo.builder()
.jobCode(i.getJob().getCode()) .jobCode(i.getJob().getCode())
.jobName(i.getJob().getName()) .jobName(i.getJob().getName())
.build()).collect(Collectors.toList())) .build())
.build() : null) .collect(Collectors.toList()))
.build() : OrgSnapshotInfo.builder().jobInfos(Collections.emptyList()).build())
.build(); .build();
FlowElement flowElement = ProcessDefinitionUtil.getBpmnModel(taskEntity.getProcessDefinitionId()).getFlowElement(taskEntity.getTaskDefinitionKey()); FlowElement flowElement = ProcessDefinitionUtil.getBpmnModel(taskEntity.getProcessDefinitionId()).getFlowElement(taskEntity.getTaskDefinitionKey());
@ -331,7 +332,7 @@ public class TaskEntityEventHandle implements EntityEventHandle<TaskEntity> {
.pageSize(Integer.MAX_VALUE) .pageSize(Integer.MAX_VALUE)
.build(); .build();
if(NumberUtils.isDigits(nodeId)) { if (NumberUtils.isDigits(nodeId)) {
build.setAncestorNodeIds(Lists.newArrayList(Long.parseLong(nodeId))); build.setAncestorNodeIds(Lists.newArrayList(Long.parseLong(nodeId)));
} }
return orgNodeUserList(build).getData(); return orgNodeUserList(build).getData();