Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into master-dc

src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD001D.java

@@ -349,15 +349,15 @@ public class ServiceHGWD001D extends TreeService {
 			return;
 		}
 		List<String> labels = ObjectUtils.listKey(nodes, "label");
-		Map<String, Integer> resultMap = null;
-		if (isType) {
-			resultMap = HGWDTools.HgWd001.countBySource(labels);
-		} else {
-			resultMap = HGWDTools.HgWd001.countByParent(labels);
-		}
+		Map<String, Integer> resultMap = HGWDTools.HgWd001.countByParent(labels);
 		for (Map node : nodes) {
-			Integer cnt = resultMap == null ? null : resultMap.get(node.get("label"));
-			node.put("leaf", cnt == null || cnt == 0 ? 1 : 0);
+			if (isType) {
+				node.put("leaf", 0);
+			} else {
+				String label = MapUtils.getString(node, "label");
+				Integer cnt = resultMap == null ? null : resultMap.get(label);
+				node.put("leaf", cnt == null || cnt == 0 ? 1 : 0);
+			}
 		}
 	}