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 cfdd240e45eef0f0cda874a74fdffba15cd1b07b..ee4ba9bef7d0305df41634c3fca7ceb189a03dfe 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 0e0a2a44314feed9c5d11bfcec190b3927e034f2..5d1401a8e0cc6870577294dc43e5b5c9cca0f070 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 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 167a309ee732bdfb1980f565305169bb4aba7c73..49a5e55f22e45bcf1f4a0b04480d71b10836be11 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 4ac62921834f1372ffa55d6e964075bf9d4c6c18..49324ec7f85005a51f4365941adf2ee75e2cdebf 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 formAttributeList = formVersion.getFormAttributeList(); if (CollectionUtils.isNotEmpty(formAttributeList)) { for (FormAttributeVo formAttributeVo : formAttributeList) {