From dfcabf5621e99d7d2d01fcb6bb7c27cd96153262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B0=E6=98=9F?= <693084682@qq.com> Date: Mon, 12 Oct 2020 22:18:16 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=20closed=20#I1Y1PH?= =?UTF-8?q?=20=E6=8E=92=E5=BA=8F=E5=8F=82=E6=95=B0=E4=B8=A2=E5=A4=B1=20htt?= =?UTF-8?q?ps://gitee.com/log4j/pig/issues/I1Y1PH?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pig/common/core/mybatis/SqlFilterArgumentResolver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/mybatis/SqlFilterArgumentResolver.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/mybatis/SqlFilterArgumentResolver.java index 09722891..4d124870 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/mybatis/SqlFilterArgumentResolver.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/mybatis/SqlFilterArgumentResolver.java @@ -79,9 +79,9 @@ public class SqlFilterArgumentResolver implements HandlerMethodArgumentResolver } List orderItemList = new ArrayList<>(); - Optional.ofNullable(ascs).ifPresent(s -> orderItemList.addAll(Arrays.stream(s).filter(Objects::isNull) + Optional.ofNullable(ascs).ifPresent(s -> orderItemList.addAll(Arrays.stream(s).filter(StrUtil::isNotBlank) .map(this::clear).map(OrderItem::asc).collect(Collectors.toList()))); - Optional.ofNullable(descs).ifPresent(s -> orderItemList.addAll(Arrays.stream(s).filter(Objects::isNull) + Optional.ofNullable(descs).ifPresent(s -> orderItemList.addAll(Arrays.stream(s).filter(StrUtil::isNotBlank) .map(this::clear).map(OrderItem::desc).collect(Collectors.toList()))); page.addOrder(orderItemList); -- GitLab