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 8c5d65dd3a2822c3394116b4674d2917dec57525..8ad2a2cb6d9b28fcdb6e3ce8d2067eafc181accd 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; }