From be16b5d1af1d8ce0babd10eef3852fe4c02f29d9 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Mon, 15 Jul 2024 11:05:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=A0=87=E9=A2=98=E6=97=A7=E7=89=88=E6=9C=AC=E6=9C=AA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84,=E9=BB=98=E8=AE=A4id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CustomerFormServiceImpl.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java index 9e3b6ce..6e22b02 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java @@ -586,18 +586,26 @@ public class CustomerFormServiceImpl implements CustomerFormService { } return str; } - + /* + form + */ @Override public ArrayList getAsfDataTitles(String formId, String dataTitle,String rangeFormula, String rangeString, String hideFormula, String hideString) { //关联表单的id String AsfFormId = formId; //根据formId(cfid)查询关联表单表名 - String asfFormName = customerFormViewMapper.getTableNameByCfid(formId).getTablekey(); + String asfFormName = customerFormViewMapper.getTableNameByCfid(AsfFormId).getTablekey(); //查询关联表单的数据标题 - String mastesformjson = customerFormViewMapper.getTableNameByCfid(formId).getMastesformjson(); + String mastesformjson = customerFormViewMapper.getTableNameByCfid(AsfFormId).getMastesformjson(); com.alibaba.fastjson2.JSONObject jsonObject = JSON.parseObject(mastesformjson); JSONArray dataTitleJsonArray = jsonObject.getJSONObject("form").getJSONArray("dataTitle"); - List dataTitleArray = dataTitleJsonArray.toJavaList(String.class); + List dataTitleArray = new ArrayList<>(); + if(jsonObject.getJSONObject("form").getJSONArray("dataTitle")==null){ + dataTitleArray.add("aaa:aaa:id"); + }else{ + dataTitleArray = dataTitleJsonArray.toJavaList(String.class); + } + //关联表单的数据标题list ArrayList toSelectDataTitles = new ArrayList<>(); for(String title : dataTitleArray){