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 2eb11d478714c870f55d52a714ac9342b18bb717..c5ecc1280f6943a55d57627005529e2d72ab21a6 100644
--- a/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java
+++ b/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java
@@ -318,10 +318,9 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
         JSONArray theadList = getTheadList(attributeVoList);
         StringBuilder header = new StringBuilder();
         List<String> headList = new ArrayList<>();
-        for (int i = 0; i < theadList.size(); i++) {
-            JSONObject obj = theadList.getJSONObject(i);
-            String title = obj.getString("title");
-            String key = obj.getString("key");
+        for (MatrixAttributeVo attributeVo : attributeVoList) {
+            String title = attributeVo.getName();
+            String key = attributeVo.getLabel();
             if (StringUtils.isNotBlank(title) && StringUtils.isNotBlank(key)) {
                 header.append(title).append(",");
                 headList.add(key);
diff --git a/src/main/java/neatlogic/module/cmdb/matrix/handler/CmdbCustomViewDataSourceHandler.java b/src/main/java/neatlogic/module/cmdb/matrix/handler/CmdbCustomViewDataSourceHandler.java
index 2ef0e8c516b82053992c85770b4662202c68e041..e9749a4c0b7d9b4790e077121261ddb7a26799fc 100644
--- a/src/main/java/neatlogic/module/cmdb/matrix/handler/CmdbCustomViewDataSourceHandler.java
+++ b/src/main/java/neatlogic/module/cmdb/matrix/handler/CmdbCustomViewDataSourceHandler.java
@@ -264,7 +264,7 @@ public class CmdbCustomViewDataSourceHandler extends MatrixDataSourceHandlerBase
         CustomViewConditionVo customViewConditionVo = new CustomViewConditionVo();
         customViewConditionVo.setCustomViewId(matrixCmdbCustomViewVo.getCustomViewId());
         customViewConditionVo.setCurrentPage(1);
-        customViewConditionVo.setPageSize(1000);
+        customViewConditionVo.setPageSize(100);
         List<Map<String, Object>> dataList = customViewDataService.searchCustomViewData(customViewConditionVo);
         Integer rowNum = customViewConditionVo.getRowNum();
         if (rowNum > 0) {
@@ -279,6 +279,9 @@ public class CmdbCustomViewDataSourceHandler extends MatrixDataSourceHandlerBase
                     list = customViewDataService.searchCustomViewData(customViewConditionVo);
                 }
                 if (CollectionUtils.isNotEmpty(list)) {
+                    if (list.size() > customViewConditionVo.getPageSize()) {
+                        list = list.subList(0, customViewConditionVo.getPageSize());
+                    }
                     StringBuilder content = new StringBuilder();
                     for (Map<String, Object> map : list) {
                         for (String head : headList) {
@@ -536,6 +539,9 @@ public class CmdbCustomViewDataSourceHandler extends MatrixDataSourceHandlerBase
                 rowDataMap.put("uuid", resultObj);
             }
             resultList.add(rowDataMap);
+            if (resultList.size() == dataVo.getPageSize()) {
+                break;
+            }
         }
         return resultList;
     }