From 83cc814d751181ae88f291a1d8bc6e5bdd315f84 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 19 Jun 2024 10:19:25 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/execution/impl/FlowOperationServiceImpl.java | 7 ++++++- wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java index eb1e07dc..71cbbc88 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java @@ -106,7 +106,12 @@ public class FlowOperationServiceImpl implements IFlowOperationService { BpmnModel bpmnModel = bpmnJSONConverter.convertToBpmnModel(deployment.getModel_key(), deployment.getVersion(), model_json); FlowNode flowNode = bpmnModel.getProcesses().get(execution.getActivity_id()); if (auxParam!=null){ - flowNode.setAuxParam(auxParam); + JSONObject param = flowNode.getAuxParam(); + if (param!=null){ + flowNode.getAuxParam().putAll(auxParam); + }else { + flowNode.setAuxParam(auxParam); + } } ExecutionEntity entity = new ExecutionEntity(); entity.setCurrentFlowElement(flowNode); diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue index 0bc5651d..7a7f30d2 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue @@ -160,8 +160,8 @@ - - + +