From 6e6acc9f34a7048c68e38aa8bd91c51c5124f6e9 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Fri, 11 Jul 2025 17:21:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(REQ-4468)=20-=20=E5=B8=A6=E6=9C=89?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=90=8C=E6=84=8F=E7=9A=84=E5=8A=A8=E4=BD=9C?= =?UTF-8?q?=EF=BC=8C=E8=AE=B0=E5=BD=95=E6=9C=80=E5=90=8E=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/core/engine/cmd/CustomApproveTaskWithFormCmd.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskWithFormCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskWithFormCmd.java index c33bc5473..a78912c29 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskWithFormCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskWithFormCmd.java @@ -44,6 +44,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import static cn.axzo.workflow.common.code.FormInstanceRespCode.FORM_FIELD_VALIDATOR_ERROR; +import static cn.axzo.workflow.common.constant.BpmnConstants.CLOSE_PROCESS_ASSIGNER; import static cn.axzo.workflow.common.constant.BpmnConstants.COMMENT_TYPE_ADVICE; import static cn.axzo.workflow.common.constant.BpmnConstants.COMMENT_TYPE_OPERATION_DESC; import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_SPECIFY_NEXT_APPROVER; @@ -177,6 +178,8 @@ public class CustomApproveTaskWithFormCmd extends AbstractCommand implemen // 记录电子签名的图片 recordSignature(task, runtimeService); + runtimeService.setVariable(task.getProcessInstanceId(), CLOSE_PROCESS_ASSIGNER, approver); + executeSynchronous(task, taskService, runtimeService, commandContext, historicTaskInstance.getTenantId()); return null; } From 289aca755ca2b1cf696790d12365e1c043a33788 Mon Sep 17 00:00:00 2001 From: wangli Date: Wed, 16 Jul 2025 10:30:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(REQ-4586)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=86=97=E4=BD=99=E4=BF=A1=E6=81=AF=E4=B8=AD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/engine/ext/listener/TaskEntityEventHandle.java | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/engine/ext/listener/TaskEntityEventHandle.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/engine/ext/listener/TaskEntityEventHandle.java index a5e79b0ea..12fde774c 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/engine/ext/listener/TaskEntityEventHandle.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/engine/ext/listener/TaskEntityEventHandle.java @@ -327,6 +327,7 @@ public class TaskEntityEventHandle implements EntityEventHandle { .needs(ListNodeUserReq.Needs.builder() .job(true) .unit(true) + .node(true) .cooperateShip(true) .personProfile(true) .workspace(true)