diff --git a/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java b/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java
index 2f011367007752cd3827de7ee38ea39c64690e27..0df4eeeabe1e4062a03532a68384d46a9d5c3ab9 100644
--- a/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java
+++ b/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java
@@ -641,6 +641,9 @@ public class FormServiceImpl implements FormService, IFormCrossoverService {
                 if (CollectionUtils.isNotEmpty(valueArray)) {
                     for (int i = 0; i < valueArray.size(); i++) {
                         Object obj = valueArray.get(i);
+                        if (obj == null) {
+                            continue;
+                        }
                         if (obj instanceof JSONObject) {
                             JSONObject jsonObj = (JSONObject) obj;
                             resultList.add(jsonObj);
diff --git a/src/main/java/neatlogic/module/framework/matrix/privatedatasource/handler/RunnerGroupMatrixPrivateDataSourceHandler.java b/src/main/java/neatlogic/module/framework/matrix/privatedatasource/handler/RunnerGroupMatrixPrivateDataSourceHandler.java
index 88ff7d036ea4eaf138e8e17717c55578d58fe888..1dd2c57c5b239b98a54d522d1707e399b53122dd 100644
--- a/src/main/java/neatlogic/module/framework/matrix/privatedatasource/handler/RunnerGroupMatrixPrivateDataSourceHandler.java
+++ b/src/main/java/neatlogic/module/framework/matrix/privatedatasource/handler/RunnerGroupMatrixPrivateDataSourceHandler.java
@@ -95,11 +95,13 @@ public class RunnerGroupMatrixPrivateDataSourceHandler implements IMatrixPrivate
                     Map<String, String> newMap = new HashMap<>();
                     for (String column : searchVo.getColumnList()) {
                         Object value = map.get(column);
-                        if (value != null) {
-                            String valueStr = value.toString();
-                            newMap.put(columnsMap.get(column), valueStr);
-                        } else {
-                            newMap.put(columnsMap.get(column), "");
+                        if (value == null) {
+                            value = "";
+                        }
+                        String valueStr = value.toString();
+                        newMap.put(columnsMap.get(column), valueStr);
+                        if (Objects.equals(column, "id")) {
+                            newMap.put("uuid", valueStr);
                         }
                     }
                     resultList.add(newMap);
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 dbd3d288fb68efe4bbb2e0e092ae888223dcf938..fa5893581883b0ffdd180082dcccdfe602fe231e 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
@@ -120,10 +120,12 @@ public class TeamMatrixPrivateDataSourceHandler implements IMatrixPrivateDataSou
                     Map<String, String> newMap = new HashMap<>();
                     for (String column : searchVo.getColumnList()) {
                         Object value = map.get(column);
-                        if (value != null) {
-                            newMap.put(columnsMap.get(column), value.toString());
-                        } else {
-                            newMap.put(columnsMap.get(column), "");
+                        if (value == null) {
+                            value = "";
+                        }
+                        newMap.put(columnsMap.get(column), value.toString());
+                        if (Objects.equals(column, "uuid")) {
+                            newMap.put("uuid", value.toString());
                         }
                     }
                     resultList.add(newMap);
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 1ae6a02d2bc682e1c908cb77c70e8a39a5792309..1d2cb4192a183fc57ecbafcfcc7ff57b610b3271 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
@@ -156,18 +156,20 @@ public class UserMatrixPrivateDataSourceHandler implements IMatrixPrivateDataSou
                     Map<String, String> newMap = new HashMap<>();
                     for (String column : searchVo.getColumnList()) {
                         Object value = map.get(column);
-                        if (value != null) {
-                            String valueStr = value.toString();
-                            if (Objects.equals(column, "vipLevel")) {
-                                if (Objects.equals(valueStr, "1")) {
-                                    valueStr = "是";
-                                } else {
-                                    valueStr = "否";
-                                }
+                        if (value == null) {
+                            value = "";
+                        }
+                        String valueStr = value.toString();
+                        if (Objects.equals(column, "vipLevel")) {
+                            if (Objects.equals(valueStr, "1")) {
+                                valueStr = "是";
+                            } else {
+                                valueStr = "否";
                             }
-                            newMap.put(columnsMap.get(column), valueStr);
-                        } else {
-                            newMap.put(columnsMap.get(column), "");
+                        }
+                        newMap.put(columnsMap.get(column), valueStr);
+                        if (Objects.equals(column, "uuid")) {
+                            newMap.put("uuid", valueStr);
                         }
                     }
                     resultList.add(newMap);