From 4d8389601c9ad97060d5693f330cee382b8ebae7 Mon Sep 17 00:00:00 2001 From: lbw Date: Thu, 9 Feb 2023 18:18:53 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E6=9B=B4=E5=A4=9A=E6=8E=92=E5=BA=8F=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/data/resolver/SqlFilterArgumentResolver.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/SqlFilterArgumentResolver.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/SqlFilterArgumentResolver.java index 39427caa2..ca1f1b6d0 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/SqlFilterArgumentResolver.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/SqlFilterArgumentResolver.java @@ -76,6 +76,11 @@ public class SqlFilterArgumentResolver implements HandlerMethodArgumentResolver String[] ascs = request.getParameterValues("ascs"); String[] descs = request.getParameterValues("descs"); + + // 兼容其他格式数组传参 + String[] ascsArry = request.getParameterValues("ascs[]"); + String[] descsArry = request.getParameterValues("descs[]"); + String current = request.getParameter("current"); String size = request.getParameter("size"); @@ -97,6 +102,10 @@ public class SqlFilterArgumentResolver implements HandlerMethodArgumentResolver Arrays.stream(s).filter(sqlInjectPredicate()).map(OrderItem::asc).collect(Collectors.toList()))); Optional.ofNullable(descs).ifPresent(s -> orderItemList.addAll( Arrays.stream(s).filter(sqlInjectPredicate()).map(OrderItem::desc).collect(Collectors.toList()))); + Optional.ofNullable(ascsArry).ifPresent(s -> orderItemList.addAll( + Arrays.stream(s).filter(sqlInjectPredicate()).map(OrderItem::asc).collect(Collectors.toList()))); + Optional.ofNullable(descsArry).ifPresent(s -> orderItemList.addAll( + Arrays.stream(s).filter(sqlInjectPredicate()).map(OrderItem::desc).collect(Collectors.toList()))); page.addOrder(orderItemList); return page;