From 3bc2b0c51d20c7d6f98e1e6bbad88b68e1e949a2 Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Wed, 22 Nov 2023 11:54:50 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95=E6=AD=A5=E9=AA=A4=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=A1=A8=E5=8D=95=E7=89=88=E6=9C=AC=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1030247036715008]后端-修改工单步骤获取表单版本默认场景逻辑 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1030247036715008 --- .../framework/form/dto/FormVersionVo.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/neatlogic/framework/form/dto/FormVersionVo.java b/src/main/java/neatlogic/framework/form/dto/FormVersionVo.java index 8ff112e97..5a92b6710 100644 --- a/src/main/java/neatlogic/framework/form/dto/FormVersionVo.java +++ b/src/main/java/neatlogic/framework/form/dto/FormVersionVo.java @@ -16,18 +16,15 @@ limitations under the License. package neatlogic.framework.form.dto; -import java.util.*; - +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.annotation.JSONField; import neatlogic.framework.common.dto.BaseEditorVo; -import com.alibaba.fastjson.JSONPath; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.annotation.JSONField; +import java.util.*; public class FormVersionVo extends BaseEditorVo { private static final long serialVersionUID = 8345592242508980127L; @@ -142,9 +139,14 @@ public class FormVersionVo extends BaseEditorVo { attributeInlineMap.put(uuid, uuidList); } } + String defaultSceneUuid = this.formConfig.getString("defaultSceneUuid"); + if (StringUtils.isBlank(sceneUuid) && StringUtils.isNotBlank(defaultSceneUuid)) { + sceneUuid = defaultSceneUuid; + } + String mainSceneUuid = this.formConfig.getString("uuid"); // 场景列表 JSONArray sceneList = this.formConfig.getJSONArray("sceneList"); - if (StringUtils.isBlank(sceneUuid) || CollectionUtils.isEmpty(sceneList)) { + if (Objects.equals(mainSceneUuid, sceneUuid) || StringUtils.isBlank(sceneUuid) || CollectionUtils.isEmpty(sceneList)) { // 如果场景UUID为空或者场景列表为空，则返回默认场景组件列表 formAttributeList = defaultSceneFormAttributeList; return formAttributeList; -- Gitee