diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/api/dto/message/HiworkTodoAdd.java b/laws-base/laws-base-core/src/main/java/com/jero/common/api/dto/message/HiworkTodoAdd.java index 1b028ab2..6fa190ce 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/api/dto/message/HiworkTodoAdd.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/api/dto/message/HiworkTodoAdd.java @@ -21,7 +21,7 @@ public class HiworkTodoAdd { private String recordId; @ApiModelProperty(value = "流程定义id") private String processDefinitionId; - @ApiModelProperty(value = "3结束,6删除,其他是待办已办") + @ApiModelProperty(value = "1待办,2已办,3结束,6删除,其他是待办已办") private String type; @ApiModelProperty(value = "转办时用") private String toUserId; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java index ac52d3e5..3d4547d7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java @@ -181,6 +181,9 @@ public class MyGlobalEventListener implements ActivitiEventListener { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessApprovalRecord::getTaskId,taskId); ProcessApprovalRecord approvalRecord = recordService.getOne(wrapper); + if (approvalRecord == null){ + return; + } String userId = approvalRecord.getUserId(); if (!Objects.equals(assignee,userId)) { @@ -190,6 +193,7 @@ public class MyGlobalEventListener implements ActivitiEventListener { List list = new ArrayList<>(); HiworkTodoAdd hiworkTodoAdd = new HiworkTodoAdd(); hiworkTodoAdd.setRecordId(approvalRecord.getId()); + hiworkTodoAdd.setType("2"); hiworkTodoAdd.setProcessDefinitionId(processDefinitionId); list.add(hiworkTodoAdd); pushWorkflowIntegrationAPI.sendTodoTask(list); @@ -200,6 +204,7 @@ public class MyGlobalEventListener implements ActivitiEventListener { // 生成被转办人的待办 list.clear(); hiworkTodoAdd.setToUserId(assignee); + hiworkTodoAdd.setType("1"); list.add(hiworkTodoAdd); pushWorkflowIntegrationAPI.sendTodoTask(list); }