From f8935ba1c197bc820957bbcdcce57b037ffa4bb5 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 18 Nov 2024 11:59:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E7=9F=A9=E9=98=B5=E8=BF=87=E6=BB=A4=E6=97=B6=E6=8A=A5=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1292636277669888]视图矩阵过滤时报服务器异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1292636277669888 --- .../framework/matrix/handler/ViewDataSourceHandler.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/neatlogic/module/framework/matrix/handler/ViewDataSourceHandler.java b/src/main/java/neatlogic/module/framework/matrix/handler/ViewDataSourceHandler.java index 8c5d65dd3..8ad2a2cb6 100644 --- a/src/main/java/neatlogic/module/framework/matrix/handler/ViewDataSourceHandler.java +++ b/src/main/java/neatlogic/module/framework/matrix/handler/ViewDataSourceHandler.java @@ -44,6 +44,7 @@ import neatlogic.framework.transaction.core.EscapeTransactionJob; import neatlogic.framework.util.Md5Util; import neatlogic.framework.util.TableResultUtil; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -449,6 +450,9 @@ public class ViewDataSourceHandler extends MatrixDataSourceHandlerBase { //对valueList去重 List> distinctList = new ArrayList<>(); for (Map valueMap : valueList) { + if (MapUtils.isEmpty(valueMap)) { + continue; + } if(distinctList.contains(valueMap)){ continue; } -- Gitee