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){