From c1108f0b1d3c1f91424f360b41b7d3f89f566458 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 22 Apr 2024 12:28:28 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E7=9F=A9=E9=98=B5?= =?UTF-8?q?=E4=B8=AD=E5=B1=9E=E6=80=A7=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E7=9A=84=E5=94=AF=E4=B8=80=E6=A0=87?= =?UTF-8?q?=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1138494599036928]后端-矩阵中属性增加用户自定义的唯一标识 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1138494599036928 --- .../framework/form/service/FormServiceImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java b/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java index 63e44bb3d..7454a1dea 100644 --- a/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java +++ b/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java @@ -858,10 +858,14 @@ public class FormServiceImpl implements FormService, IFormCrossoverService { if (Objects.equals("formtable", dataObj.getString("handler"))) { FormAttributeParentVo parent3 = new FormAttributeParentVo(dataObj.getString("uuid"), dataObj.getString("label"), parent2); JSONObject config2 = dataObj.getJSONObject("config"); - JSONArray dataConfigList2 = config2.getJSONArray("dataConfig"); - for (int j = 0; j < dataConfigList2.size(); j++) { - JSONObject dataObj2 = dataConfigList2.getJSONObject(j); - resultList.addAll(getFormAttributeList(dataObj2, parent3)); + if (MapUtils.isNotEmpty(config2)) { + JSONArray dataConfigList2 = config2.getJSONArray("dataConfig"); + if (CollectionUtils.isNotEmpty(dataConfigList2)) { + for (int j = 0; j < dataConfigList2.size(); j++) { + JSONObject dataObj2 = dataConfigList2.getJSONObject(j); + resultList.addAll(getFormAttributeList(dataObj2, parent3)); + } + } } } } -- Gitee