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(); }