From 2a167f5b86f0c55a22acb58ca15f63b4a2a2de68 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Mon, 29 Jul 2024 10:28:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5go=E6=8E=A5=E5=8F=A3=E6=9B=B4?= =?UTF-8?q?=E6=94=B9,=E4=BF=AE=E5=A4=8D"=E6=9F=A5=E6=97=A0=E6=AD=A4?= =?UTF-8?q?=E8=A1=A8=E5=8D=95"=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lowcode/controller/AssociatedFormsController.java | 2 ++ .../lowcode/service/impl/CustomerFormServiceImpl.java | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java b/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java index 6542164..98798d9 100644 --- a/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java +++ b/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java @@ -66,6 +66,8 @@ public class AssociatedFormsController { }else{ if(tree.getId().equals("cfid为空")){ return JsonData.buildSuccess(tree); + }else if(tree.getId().equals("masterTable为null")){ + return JsonData.buildSuccess(tree); } return JsonData.buildSuccess(tree); } 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 4564849..a1bde84 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java @@ -329,9 +329,15 @@ public class CustomerFormServiceImpl implements CustomerFormService { - ArrayNode masterTableArr = (ArrayNode) data.get("masterTable"); JsonNode sunTableArrObj = data.get("sunTable"); JsonNode masterTableName = data.get("masterTableName"); + JsonNode masterTable_Node = data.get("masterTable"); + + if(masterTable_Node.isNull()){ + tree.setId("masterTable为null"); + return tree; + } + ArrayNode masterTableArr = (ArrayNode) data.get("masterTable"); HashMap showMap = new HashMap<>(); showMap.put("show",masterTableName.toString().replace("\"",""));