From c355fcac046ea74e12cd38ee1d0b2538883e024e Mon Sep 17 00:00:00 2001 From: zhouhongfa Date: Sat, 15 Jun 2019 15:21:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=99=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/wugui/dataxweb/controller/BaseForm.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/datax-web/src/main/java/com/wugui/dataxweb/controller/BaseForm.java b/datax-web/src/main/java/com/wugui/dataxweb/controller/BaseForm.java index da4f06c2..35ccaa9f 100644 --- a/datax-web/src/main/java/com/wugui/dataxweb/controller/BaseForm.java +++ b/datax-web/src/main/java/com/wugui/dataxweb/controller/BaseForm.java @@ -153,8 +153,9 @@ public class BaseForm { */ public Page getPlusPagingQueryEntity() { Page page = new Page(); - page.setCurrent(Long.valueOf(StrUtil.toString(this.get("current")))); - page.setSize(Long.valueOf(StrUtil.toString(this.getString("size")))); + //如果无current，默认返回1000条数据 + page.setCurrent(Long.valueOf(StrUtil.toString(ObjectUtil.defaultIfNull(this.get("current"), "0")))); + page.setSize(Long.valueOf(StrUtil.toString(ObjectUtil.defaultIfNull(this.get("size"), "1000")))); if (ObjectUtil.isNotNull(this.get("ifCount"))) { page.setSearchCount(BooleanUtil.toBoolean(this.getString("ifCount"))); } else {