From cdc47aea48fcf461fe9df65e78a12cc3c819f924 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 29 Jul 2024 16:27:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8=E5=8D=95-?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E7=8A=B6=E6=80=81=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1209479612301312]表单-选择表格组件，选择数据时，选中状态异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1209479612301312 --- .../form/service/FormServiceImpl.java | 3 +++ ...erGroupMatrixPrivateDataSourceHandler.java | 12 ++++++---- .../TeamMatrixPrivateDataSourceHandler.java | 10 ++++---- .../UserMatrixPrivateDataSourceHandler.java | 24 ++++++++++--------- 4 files changed, 29 insertions(+), 20 deletions(-) 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 2f0113670..0df4eeeab 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 88ff7d036..1dd2c57c5 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 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 dbd3d288f..fa5893581 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 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 1ae6a02d2..1d2cb4192 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 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); -- Gitee