From 2d00d9ab990735789c796a8db066e0ad85184007 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 15 May 2024 14:59:17 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E4=B8=8A=E6=8A=A5=E5=B7=A5=E5=8D=95=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=8A=A5=E5=BC=82=E5=B8=B8=EF=BC=8C=E8=A1=A8=E5=8D=95=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E4=B8=8D=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1157124304896000]第三方上报工单接口报异常，表单属性不存在 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1157124304896000
---
 src/main/java/neatlogic/framework/util/FormUtil.java            | 2 ++
 .../handler/Integration2FormAttrDependencyHandler.java          | 2 ++
 .../handler/MatrixAttr2FormAttrDependencyHandler.java           | 2 ++
 .../framework/importexport/handler/FormImportExportHandler.java | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/src/main/java/neatlogic/framework/util/FormUtil.java b/src/main/java/neatlogic/framework/util/FormUtil.java
index a1fcf9ed3..d84344a70 100644
--- a/src/main/java/neatlogic/framework/util/FormUtil.java
+++ b/src/main/java/neatlogic/framework/util/FormUtil.java
@@ -215,6 +215,8 @@ public class FormUtil {
         if (formVersionVo == null) {
             return;
         }
+        String mainSceneUuid = formVersionVo.getFormConfig().getString("uuid");
+        formVersionVo.setSceneUuid(mainSceneUuid);
         List<FormAttributeVo> formAttributeList = formVersionVo.getFormAttributeList();
         if (CollectionUtils.isEmpty(formAttributeList)) {
             return;
diff --git a/src/main/java/neatlogic/module/framework/dependency/handler/Integration2FormAttrDependencyHandler.java b/src/main/java/neatlogic/module/framework/dependency/handler/Integration2FormAttrDependencyHandler.java
index e32637de5..7572c4d12 100644
--- a/src/main/java/neatlogic/module/framework/dependency/handler/Integration2FormAttrDependencyHandler.java
+++ b/src/main/java/neatlogic/module/framework/dependency/handler/Integration2FormAttrDependencyHandler.java
@@ -57,6 +57,8 @@ public class Integration2FormAttrDependencyHandler extends FixedTableDependencyH
                 if (formVersionVo != null) {
                     FormVo formVo = formMapper.getFormByUuid(formVersionVo.getFormUuid());
                     if (formVo != null) {
+                        String mainSceneUuid = formVersionVo.getFormConfig().getString("uuid");
+                        formVersionVo.setSceneUuid(mainSceneUuid);
                         List<FormAttributeVo> formAttributeList = formVersionVo.getFormAttributeList();
                         if (CollectionUtils.isNotEmpty(formAttributeList)) {
                             for (FormAttributeVo formAttributeVo : formAttributeList) {
diff --git a/src/main/java/neatlogic/module/framework/dependency/handler/MatrixAttr2FormAttrDependencyHandler.java b/src/main/java/neatlogic/module/framework/dependency/handler/MatrixAttr2FormAttrDependencyHandler.java
index 479d5d81f..6b0d8fd5f 100644
--- a/src/main/java/neatlogic/module/framework/dependency/handler/MatrixAttr2FormAttrDependencyHandler.java
+++ b/src/main/java/neatlogic/module/framework/dependency/handler/MatrixAttr2FormAttrDependencyHandler.java
@@ -57,6 +57,8 @@ public class MatrixAttr2FormAttrDependencyHandler extends FixedTableDependencyHa
                 if (formVersionVo != null) {
                     FormVo formVo = formMapper.getFormByUuid(formVersionVo.getFormUuid());
                     if (formVo != null) {
+                        String mainSceneUuid = formVersionVo.getFormConfig().getString("uuid");
+                        formVersionVo.setSceneUuid(mainSceneUuid);
                         List<FormAttributeVo> formAttributeList = formVersionVo.getFormAttributeList();
                         if (CollectionUtils.isNotEmpty(formAttributeList)) {
                             for (FormAttributeVo formAttributeVo : formAttributeList) {
diff --git a/src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java b/src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java
index 0e4266ce0..e0bd653a5 100644
--- a/src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java
+++ b/src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java
@@ -125,6 +125,8 @@ public class FormImportExportHandler extends ImportExportHandlerBase {
         }
         // 插入依赖
         FormUtil.saveDependency(formVersion);
+        String mainSceneUuid = formVersion.getFormConfig().getString("uuid");
+        formVersion.setSceneUuid(mainSceneUuid);
         List<FormAttributeVo> formAttributeList = formVersion.getFormAttributeList();
         // 激活版本
         FormVersionVo oldActiveFormVersion = formMapper.getActionFormVersionByFormUuid(form.getUuid());
-- 
Gitee