From ed27dadaf26fe5e3f9ca2df8b8932c3d6c20a6d5 Mon Sep 17 00:00:00 2001
From: xuxuzhesi <ipqs45010@163.com>
Date: Mon, 4 Nov 2019 10:39:00 +0800
Subject: [PATCH] #296 fix the ci check

---
 .../webank/cmdb/controller/ui/helper/UIWrapperService.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmdb-core/src/main/java/com/webank/cmdb/controller/ui/helper/UIWrapperService.java b/cmdb-core/src/main/java/com/webank/cmdb/controller/ui/helper/UIWrapperService.java
index bb3fd7325..e0411d78c 100644
--- a/cmdb-core/src/main/java/com/webank/cmdb/controller/ui/helper/UIWrapperService.java
+++ b/cmdb-core/src/main/java/com/webank/cmdb/controller/ui/helper/UIWrapperService.java
@@ -1337,13 +1337,13 @@ private void getBottomChildrenDataByBottomCiTypeId(Integer ciTypeId, Integer bot
         for (CiData ciData : ciDatas) {
             Map<String, Object> ciDataMap = ciData.getData();
             List<CiTypeAttrDto> childrenCiTypeRelativeAttributes = findChildrenCiTypeRelativeAttributes(ciTypeId, uiProperties.getReferenceCodeOfBelong());
-            if (childrenCiTypeRelativeAttributes.size() != 0) {
+            if (childrenCiTypeRelativeAttributes.size() != 0 && ciDataMap.get("guid") != null) {
                 findBelongCi = getBottomChildrenDataByRelativeAttributes(childrenCiTypeRelativeAttributes, limitedCiTypeIds, ciDataMap.get("guid").toString(), bottomChildrenData, bottomCiTypeId, subsystemFilters);
             }
 
             if (!findBelongCi) {
                 List<CiTypeAttrDto> realizeCiTypeRelativeAttributes = findRealizeCiAttributesByCiTypeId(ciTypeId);
-                if (realizeCiTypeRelativeAttributes.size() != 0) {
+                if (realizeCiTypeRelativeAttributes.size() != 0 && ciDataMap.get("guid") != null) {
                     getBottomChildrenDataByRealizeAttributes(realizeCiTypeRelativeAttributes, limitedCiTypeIds, ciDataMap.get("guid").toString(), bottomChildrenData, bottomCiTypeId, subsystemFilters);
                 }
             }