diff --git a/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java b/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java
index 65bfc0378251f567fa9f7ae5d7c8bc63e21078ff..8473621754a96eacc2629cb1e0b8e31437ec96e4 100644
--- a/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java
+++ b/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java
@@ -259,14 +259,15 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
             if (CollectionUtils.isNotEmpty(showAttributeList)) {
                 for (int i = 0; i < showAttributeList.size(); i++) {
                     JSONObject showAttributeObj = showAttributeList.getJSONObject(i);
-                    if (MapUtils.isEmpty(showAttributeObj)) {
-                        continue;
+                    if (MapUtils.isNotEmpty(showAttributeObj)) {
+                        String label = showAttributeObj.getString("label");
+                        if (StringUtils.isNotBlank(label)) {
+                            JSONObject attributeMappingObj = new JSONObject();
+                            attributeMappingObj.put("label", label);
+                            attributeMappingObj.put("uniqueIdentifier", "");
+                            attributeMappingList.add(attributeMappingObj);
+                        }
                     }
-                    String label = showAttributeObj.getString("label");
-                    JSONObject attributeMappingObj = new JSONObject();
-                    attributeMappingObj.put("label", label);
-                    attributeMappingObj.put("uniqueIdentifier", "");
-                    attributeMappingList.add(attributeMappingObj);
                 }
             }
             config.put("attributeMappingList", attributeMappingList);
@@ -1140,17 +1141,16 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
         if (CollectionUtils.isNotEmpty(showAttributeList)) {
             for (int i = 0; i < showAttributeList.size(); i++) {
                 JSONObject showAttributeObj = showAttributeList.getJSONObject(i);
-                if (MapUtils.isEmpty(showAttributeObj)) {
-                    continue;
-                }
-                String label = showAttributeObj.getString("label");
-                if (StringUtils.isNotBlank(label)) {
-                    if (label.startsWith("attr_")) {
-                        attrIdList.add(Long.valueOf(label.substring(5)));
-                    } else if (label.startsWith("relfrom_")) {
-                        relIdList.add(Long.valueOf(label.substring(8)));
-                    } else if (label.startsWith("relto_")) {
-                        relIdList.add(Long.valueOf(label.substring(6)));
+                if (MapUtils.isNotEmpty(showAttributeObj)) {
+                    String label = showAttributeObj.getString("label");
+                    if (StringUtils.isNotBlank(label)) {
+                        if (label.startsWith("attr_")) {
+                            attrIdList.add(Long.valueOf(label.substring(5)));
+                        } else if (label.startsWith("relfrom_")) {
+                            relIdList.add(Long.valueOf(label.substring(8)));
+                        } else if (label.startsWith("relto_")) {
+                            relIdList.add(Long.valueOf(label.substring(6)));
+                        }
                     }
                 }
             }