From a996c9281f8f5a12d9030b169f7290e2bf35a403 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 19 Jun 2024 10:43:15 +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 --- .../converter/node/impl/ServerTaskConverter.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/ServerTaskConverter.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/ServerTaskConverter.java index 4ab2e769..203d682e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/ServerTaskConverter.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/ServerTaskConverter.java @@ -26,9 +26,11 @@ public class ServerTaskConverter extends BaseNodeConverter { form.setForm_type(properties.getString("form_type")); JSONObject carry = model.getAuxParam(); if (carry!=null){ - form.setAuxParam(carry); - }else { - form.setAuxParam(properties.getJSONObject("auxParam")); + if (form.getAuxParam()!=null){ + form.getAuxParam().putAll(carry); + }else { + form.setAuxParam(carry); + } } form.setName(properties.getString("name")); form.setDocumentation(properties.getString("documentation"));