diff --git a/src/main/java/neatlogic/module/framework/matrix/privatedatasource/handler/TeamMatrixPrivateDataSourceHandler.java b/src/main/java/neatlogic/module/framework/matrix/privatedatasource/handler/TeamMatrixPrivateDataSourceHandler.java
index 2290b5f45f392c5db1d52fd401548b9c33fa2c3f..dbd3d288fb68efe4bbb2e0e092ae888223dcf938 100644
--- a/src/main/java/neatlogic/module/framework/matrix/privatedatasource/handler/TeamMatrixPrivateDataSourceHandler.java
+++ b/src/main/java/neatlogic/module/framework/matrix/privatedatasource/handler/TeamMatrixPrivateDataSourceHandler.java
@@ -143,6 +143,7 @@ public class TeamMatrixPrivateDataSourceHandler implements IMatrixPrivateDataSou
             for(MatrixAttributeVo matrixAttributeVo : matrixAttributeList){
                 if (Objects.equals(matrixAttributeVo.getUuid(), column)) {
                     columnList.add(matrixAttributeVo.getLabel());
+                    break;
                 }
             }
         }
@@ -153,6 +154,7 @@ public class TeamMatrixPrivateDataSourceHandler implements IMatrixPrivateDataSou
                 for (MatrixAttributeVo matrixAttributeVo : matrixAttributeList) {
                     if (Objects.equals(matrixAttributeVo.getUuid(), notNullColumn)) {
                         notNullColumnList.add(matrixAttributeVo.getLabel());
+                        break;
                     }
                 }
             }
@@ -189,7 +191,7 @@ public class TeamMatrixPrivateDataSourceHandler implements IMatrixPrivateDataSou
             }
         }
         newDataVo.setFilterList(newFilterList);
-        return dataVo;
+        return newDataVo;
     }
 
     private List<Map<String, String>> teamListConvertDataList(List<TeamVo> teamList) {
diff --git a/src/main/java/neatlogic/module/framework/matrix/privatedatasource/handler/UserMatrixPrivateDataSourceHandler.java b/src/main/java/neatlogic/module/framework/matrix/privatedatasource/handler/UserMatrixPrivateDataSourceHandler.java
index f60426d6e9134ea0e7ed56e00783b9b1bdee5ce3..1ae6a02d2bc682e1c908cb77c70e8a39a5792309 100644
--- a/src/main/java/neatlogic/module/framework/matrix/privatedatasource/handler/UserMatrixPrivateDataSourceHandler.java
+++ b/src/main/java/neatlogic/module/framework/matrix/privatedatasource/handler/UserMatrixPrivateDataSourceHandler.java
@@ -187,6 +187,7 @@ public class UserMatrixPrivateDataSourceHandler implements IMatrixPrivateDataSou
             for(MatrixAttributeVo matrixAttributeVo : matrixAttributeList){
                 if (Objects.equals(matrixAttributeVo.getUuid(), column)) {
                     columnList.add(matrixAttributeVo.getLabel());
+                    break;
                 }
             }
         }
@@ -197,6 +198,7 @@ public class UserMatrixPrivateDataSourceHandler implements IMatrixPrivateDataSou
                 for(MatrixAttributeVo matrixAttributeVo : matrixAttributeList){
                     if (Objects.equals(matrixAttributeVo.getUuid(), notNullColumn)) {
                         notNullColumnList.add(matrixAttributeVo.getLabel());
+                        break;
                     }
                 }
             }