From f1ff0265cc6bfa968df943052ba94279914dc1ea Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 21 Mar 2024 10:51:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=A4=84=E7=90=86-=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E5=88=86=E7=BB=84=E7=9F=A9=E9=98=B5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=B7=A5=E5=8D=95=E8=8E=B7=E5=8F=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1116625799970816]工单处理-表单组件引用分组矩阵数据，工单获取数据异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1116625799970816 --- .../handler/TeamMatrixPrivateDataSourceHandler.java | 4 +++- .../handler/UserMatrixPrivateDataSourceHandler.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 2290b5f45..dbd3d288f 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> teamListConvertDataList(List 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 f60426d6e..1ae6a02d2 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; } } } -- Gitee