From 1662a2d648f48d0bd06f0058a55762acc09270ca Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 15 May 2024 15:03:52 +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/module/tenant/api/form/FormCopyApi.java | 2 ++
 .../java/neatlogic/module/tenant/api/form/FormImportApi.java    | 2 ++
 src/main/java/neatlogic/module/tenant/api/form/FormSaveApi.java | 2 ++
 .../neatlogic/module/tenant/api/form/FormVersionActiveApi.java  | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/src/main/java/neatlogic/module/tenant/api/form/FormCopyApi.java b/src/main/java/neatlogic/module/tenant/api/form/FormCopyApi.java
index cfdd240e..ee4ba9be 100644
--- a/src/main/java/neatlogic/module/tenant/api/form/FormCopyApi.java
+++ b/src/main/java/neatlogic/module/tenant/api/form/FormCopyApi.java
@@ -125,6 +125,8 @@ public class FormCopyApi extends PrivateApiComponentBase {
             if (formVersionVo.getIsActive().equals(1)) {
                 newFrom.setCurrentVersion(formVersionVo.getVersion());
                 newFrom.setCurrentVersionUuid(formVersionVo.getUuid());
+                String mainSceneUuid = formVersionVo.getFormConfig().getString("uuid");
+                formVersionVo.setSceneUuid(mainSceneUuid);
                 // 对应激活版本需要插入表单属性
                 for (FormAttributeVo formAttributeVo : formVersionVo.getFormAttributeList()) {
                     formMapper.insertFormAttribute(formAttributeVo);
diff --git a/src/main/java/neatlogic/module/tenant/api/form/FormImportApi.java b/src/main/java/neatlogic/module/tenant/api/form/FormImportApi.java
index 0e0a2a44..5d1401a8 100755
--- a/src/main/java/neatlogic/module/tenant/api/form/FormImportApi.java
+++ b/src/main/java/neatlogic/module/tenant/api/form/FormImportApi.java
@@ -109,6 +109,8 @@ public class FormImportApi extends PrivateBinaryStreamApiComponentBase {
                         //保存激活版本时，更新表单属性信息
                         if (Objects.equal(formVersion.getIsActive(), 1)) {
                             formMapper.deleteFormAttributeByFormUuid(formVo.getUuid());
+                            String mainSceneUuid = formVersion.getFormConfig().getString("uuid");
+                            formVersion.setSceneUuid(mainSceneUuid);
                             List<FormAttributeVo> formAttributeList = formVersion.getFormAttributeList();
                             if (CollectionUtils.isNotEmpty(formAttributeList)) {
                                 for (FormAttributeVo formAttributeVo : formAttributeList) {
diff --git a/src/main/java/neatlogic/module/tenant/api/form/FormSaveApi.java b/src/main/java/neatlogic/module/tenant/api/form/FormSaveApi.java
index 167a309e..49a5e55f 100644
--- a/src/main/java/neatlogic/module/tenant/api/form/FormSaveApi.java
+++ b/src/main/java/neatlogic/module/tenant/api/form/FormSaveApi.java
@@ -162,6 +162,8 @@ public class FormSaveApi extends PrivateApiComponentBase {
                             formAttributeOldUuid2NewUuidMap.put(oldUuid, newUuid);
                         }
                         formVersionVo.setFormConfig(JSONObject.parseObject(formConfigStr));
+                        mainSceneUuid = formVersionVo.getFormConfig().getString("uuid");
+                        formVersionVo.setSceneUuid(mainSceneUuid);
                         formVersionVo.setFormAttributeList(null);
                         formAttributeList = formVersionVo.getFormAttributeList();
                     }
diff --git a/src/main/java/neatlogic/module/tenant/api/form/FormVersionActiveApi.java b/src/main/java/neatlogic/module/tenant/api/form/FormVersionActiveApi.java
index 4ac62921..49324ec7 100755
--- a/src/main/java/neatlogic/module/tenant/api/form/FormVersionActiveApi.java
+++ b/src/main/java/neatlogic/module/tenant/api/form/FormVersionActiveApi.java
@@ -72,6 +72,8 @@ public class FormVersionActiveApi extends PrivateApiComponentBase {
         formMapper.updateFormVersion(formVersionVo);
 
         formMapper.deleteFormAttributeByFormUuid(formVersion.getFormUuid());
+        String mainSceneUuid = formVersion.getFormConfig().getString("uuid");
+        formVersion.setSceneUuid(mainSceneUuid);
         List<FormAttributeVo> formAttributeList = formVersion.getFormAttributeList();
         if (CollectionUtils.isNotEmpty(formAttributeList)) {
             for (FormAttributeVo formAttributeVo : formAttributeList) {
-- 
Gitee