From d87fc88fb3c58a16466dca7bf4c6178e62eb13c2 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Sun, 1 Dec 2024 20:51:18 +0800
Subject: [PATCH] =?UTF-8?q?rev:form=5Fdata=E8=A1=A8=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/behavior/impl/StrucFormActivityBehavior.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StrucFormActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StrucFormActivityBehavior.java
index f2e41978..67db7320 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StrucFormActivityBehavior.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StrucFormActivityBehavior.java
@@ -3,6 +3,7 @@ package org.nl.wms.flow_manage.flow.framework.engine.behavior.impl;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.domain.exception.BadRequestException;
@@ -89,7 +90,8 @@ public class StrucFormActivityBehavior extends FlowNodeActivityBehavior<JSONObje
                 mst_json.put("status",StatusEnum.FORM_STATUS.code("生成"));
                 mst_json.put("code",CodeUtil.getNewCode(currentNode.getForm_type()));
                 mst_json.put("proc_inst_id",entity.getProc_inst_id());
-                PmFormData mst = mst_json.toJavaObject(PmFormData.class);
+                String s = mst_json.toString();
+                PmFormData mst = JSONObject.parseObject(s, PmFormData.class, Feature.OrderedField);
                 handler.put("form_id",mst.getId());
                 JSONArray itemArr = handler.getJSONArray("item");
                 if(itemArr !=null){
@@ -104,7 +106,8 @@ public class StrucFormActivityBehavior extends FlowNodeActivityBehavior<JSONObje
                         dtl.put("source_form_id",item.getString("source_form_id"));
                         dtl.put("source_form_type",item.getString("source_form_type"));
                         dtl.put("form_type",item.getString("form_type"));
-                        PmFormData iostorinvdtl= dtl.toJavaObject(PmFormData.class);
+                        String dels = dtl.toString();
+                        PmFormData iostorinvdtl = JSONObject.parseObject(dels, PmFormData.class, Feature.OrderedField);
                         item.put("form_id",iostorinvdtl.getId());
                         iPmFormDataService.save(iostorinvdtl);
                     }