From d4debff7efb02a42763387d7756b09df7d761f49 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 10 May 2024 17:44:39 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=BD=AC=E5=8A=9E=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=BB=99hiwork=E5=85=88=E5=8F=91=E9=80=81=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=9C=A8=E5=8F=91=E9=80=81=E6=96=B0=E5=BE=85?= =?UTF-8?q?=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/api/dto/message/HiworkTodoAdd.java | 2 +- .../modules/activiti/listener/MyGlobalEventListener.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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); }