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<String,Object> showMap = new HashMap<>();
                     showMap.put("show",masterTableName.toString().replace("\"",""));