diff --git a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java
index 5e9359afefab65915fabe7bdac26ea5cc61bad61..4aafc063a5af890c5c67ef469451da02b8bae227 100644
--- a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java
+++ b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java
@@ -164,7 +164,15 @@ public class MatrixColumnDataSearchForSelectApi extends PrivateApiComponentBase
         if (CollectionUtils.isEmpty(matrixAttributeList)) {
             return new JSONObject();
         }
-        Map<String, String> nameToUuidMap = matrixAttributeList.stream().collect(Collectors.toMap(MatrixAttributeVo::getName, MatrixAttributeVo::getUuid));
+        Map<String, String> nameToUuidMap = new HashMap<>();
+        for (MatrixAttributeVo matrixAttributeVo : matrixAttributeList) {
+            String name = matrixAttributeVo.getName();
+            if(nameToUuidMap.containsKey(name)) {
+                nameToUuidMap.remove(name);
+            } else {
+                nameToUuidMap.put(name, matrixAttributeVo.getUuid());
+            }
+        }
         List<MatrixFilterVo> filterList = dataVo.getFilterList();
         if (CollectionUtils.isNotEmpty(filterList)) {
             Iterator<MatrixFilterVo> iterator = filterList.iterator();
diff --git a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForTableNewApi.java b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForTableNewApi.java
index 20a8ca92d101d1dead4e3c9ab8ac5504f5172193..47b233e31a39ced3f5b7014e5e5048b9f35616af 100644
--- a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForTableNewApi.java
+++ b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForTableNewApi.java
@@ -157,7 +157,15 @@ public class MatrixColumnDataSearchForTableNewApi extends PrivateApiComponentBas
         if (CollectionUtils.isEmpty(matrixAttributeList)) {
             return new JSONObject();
         }
-        Map<String, String> nameToUuidMap = matrixAttributeList.stream().collect(Collectors.toMap(MatrixAttributeVo::getName, MatrixAttributeVo::getUuid));
+        Map<String, String> nameToUuidMap = new HashMap<>();
+        for (MatrixAttributeVo matrixAttributeVo : matrixAttributeList) {
+            String name = matrixAttributeVo.getName();
+            if(nameToUuidMap.containsKey(name)) {
+                nameToUuidMap.remove(name);
+            } else {
+                nameToUuidMap.put(name, matrixAttributeVo.getUuid());
+            }
+        }
         List<MatrixFilterVo> filterList = dataVo.getFilterList();
         if (CollectionUtils.isNotEmpty(filterList)) {
             Iterator<MatrixFilterVo> iterator = filterList.iterator();