From 8b0c263e45fdf3ff2892f0d87fee6e59d3e020d2 Mon Sep 17 00:00:00 2001 From: zhenggm Date: Wed, 20 Jul 2022 16:49:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E7=BF=BB=E9=A1=B5=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E4=BC=A0total?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/smtweb/framework/core/mvc/service/AbstractListHandler.java | 7 +++++-- .../java/cc/smtweb/framework/core/mvc/service/SwListData.java | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractListHandler.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractListHandler.java index e8b3376..df06082 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractListHandler.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractListHandler.java @@ -58,7 +58,6 @@ public abstract class AbstractListHandler extends AbstractHandler { List listData; SqlPara sqlPara = buildDataSql(); - String sort = params.readString("sort"); String order = params.readString("order"); String sql; @@ -73,7 +72,11 @@ public abstract class AbstractListHandler extends AbstractHandler { listData = queryData(sql, sqlPara); afterQuery(listData); - return SwListData.create(listData, sqlPara.rows); + if (sqlPara.page <= 1) { + return SwListData.create(listData, sqlPara.rows); + } else { + return SwListData.create(listData); + } } protected List queryData(String sql, SqlPara sqlPara) { diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/SwListData.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/SwListData.java index d2299d2..4ba767f 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/SwListData.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/SwListData.java @@ -30,6 +30,14 @@ public class SwListData { } } + public static SwListData create(List list) { + if (list == null) { + return SwListData.EMPTY; + } + + return new SwListData(list, -1); + } + public boolean isEmpty() { return this.rows == null || this.rows.isEmpty(); }