#296 fix the ci check

WeBankPartners · Nov 4, 2019 · ed27dad · ed27dad
1 parent b2a91d8
commit ed27dad
Showing 1 changed file with 2 additions and 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
@@ -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);
                 }
             }