From 3284eb81a736c1cf3e78d92ecb690d47e5d7e7e6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 Aug 2022 15:42:29 +0800
Subject: [PATCH] Merge branch 'improve' of http://120.27.238.55:7000/r/farmer-cms into improve

---
 src/main/java/com/xcong/farmer/cms/core/handler/ChildDataParserHandler.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/core/handler/ChildDataParserHandler.java b/src/main/java/com/xcong/farmer/cms/core/handler/ChildDataParserHandler.java
index 94a06e2..3a13910 100644
--- a/src/main/java/com/xcong/farmer/cms/core/handler/ChildDataParserHandler.java
+++ b/src/main/java/com/xcong/farmer/cms/core/handler/ChildDataParserHandler.java
@@ -18,13 +18,16 @@
 
     @Override
     public void dataParser(AttrNode attrNode) {
-        log.info("#数据子集执行#");
+//        log.info("#数据子集执行#");
         Map<String, Object> parserData = attrNode.getParserData();
 
         Child param = (Child) attrNode.getParam();
         String obj = param.getObj();
 
         Object o = parserData.get(obj);
+        if (o == null) {
+            return;
+        }
         Object state = JSONObject.parseObject(JSONObject.toJSONString(o)).get("state");
         List children = JSONObject.parseObject(JSONObject.toJSONString(state)).getObject("children", List.class);
         attrNode.setData(children);

--
Gitblit v1.9.1