From 736db6506f990b2e0b6fba8714fa5f3cc0a9e7a1 Mon Sep 17 00:00:00 2001 From: tony <846249920@qq.com> Date: Thu, 9 Feb 2023 16:02:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BC=9A=E7=AD=BE?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=97=A0=E6=B3=95=E5=AE=A1=E6=89=B9=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java | 4 ++-- ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue | 2 +- ruoyi-ui/src/views/flowable/task/todo/detail/index.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java index 505d656d..0823cb14 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java @@ -1018,7 +1018,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask MultiInstanceLoopCharacteristics multiInstance = userTask.getLoopCharacteristics(); // 会签节点 if (Objects.nonNull(multiInstance)) { - flowNextDto.setVars(multiInstance.getElementVariable()); + flowNextDto.setVars(multiInstance.getInputDataItem()); flowNextDto.setType(ProcessConstants.PROCESS_MULTI_INSTANCE); flowNextDto.setDataType(ProcessConstants.DYNAMIC); } else { @@ -1055,7 +1055,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask MultiInstanceLoopCharacteristics multiInstance = userTask.getLoopCharacteristics(); // 会签节点 if (Objects.nonNull(multiInstance)) { - flowNextDto.setVars(multiInstance.getElementVariable()); + flowNextDto.setVars(multiInstance.getInputDataItem()); flowNextDto.setType(ProcessConstants.PROCESS_MULTI_INSTANCE); flowNextDto.setDataType(ProcessConstants.DYNAMIC); } else { diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue b/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue index 74be9be3..6cfacb73 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue @@ -235,7 +235,7 @@ export default { if (selection instanceof Array) { const selectVal = selection.map(item => item.userId); if (this.multiInstanceVars) { - this.checkValues = selection; + this.checkValues = selectVal; } else { this.checkValues = selectVal.join(','); } diff --git a/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue b/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue index 87f104b0..6ceaefe7 100644 --- a/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue +++ b/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue @@ -272,7 +272,7 @@ export default { if (selection instanceof Array) { const selectVal = selection.map(item => item.userId); if (this.multiInstanceVars) { - this.$set(this.taskForm.variables, this.multiInstanceVars, selection); + this.$set(this.taskForm.variables, this.multiInstanceVars, selectVal); } else { this.$set(this.taskForm.variables, "approval", selectVal.join(',')); }