diff --git a/dsBase/src/main/java/com/dsideal/base/Util/RetKit.java b/dsBase/src/main/java/com/dsideal/base/Util/RetKit.java index c89a718b..5bf1c77b 100644 --- a/dsBase/src/main/java/com/dsideal/base/Util/RetKit.java +++ b/dsBase/src/main/java/com/dsideal/base/Util/RetKit.java @@ -21,6 +21,9 @@ public class RetKit { public static Map renderSuccess(String msg, List list) { return renderSuccess(msg, list, null, 0, 0, 0); } + public static Map renderSuccess(Page page) { + return renderSuccess(null, page.getList(), "list", page.getPageNumber(), page.getPageSize(), page.getTotalRow()); + } public static Map renderSuccess(String msg, Page page, String dataName) { return renderSuccess(msg, page.getList(), dataName, page.getPageNumber(), page.getPageSize(), page.getTotalRow()); diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java index 5c24a2e2..43d98a13 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java +++ b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java @@ -3,6 +3,7 @@ package com.dsideal.resource.Base.Controller; import com.dsideal.resource.Base.Model.BaseModel; import com.dsideal.resource.Util.RetKit; import com.jfinal.core.Controller; +import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import java.util.List; @@ -15,6 +16,11 @@ public class BaseController extends Controller { */ public void getStageList() { List list = bm.getStageList(); - renderJson(RetKit.renderSuccess(list)); + Page page=new Page<>(); + page.setList(list); + page.setPageSize(20); + page.setTotalRow(list.size()); + page.setPageNumber(1); + renderJson(RetKit.renderSuccess(page)); } } diff --git a/dsRes/src/main/java/com/dsideal/resource/Util/RetKit.java b/dsRes/src/main/java/com/dsideal/resource/Util/RetKit.java index 43ea2eb2..9e299d4a 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Util/RetKit.java +++ b/dsRes/src/main/java/com/dsideal/resource/Util/RetKit.java @@ -21,6 +21,9 @@ public class RetKit { public static Map renderSuccess(String msg, List list) { return renderSuccess(msg, list, null, 0, 0, 0); } + public static Map renderSuccess(Page page) { + return renderSuccess(null, page.getList(), "list", page.getPageNumber(), page.getPageSize(), page.getTotalRow()); + } public static Map renderSuccess(String msg, Page page, String dataName) { return renderSuccess(msg, page.getList(), dataName, page.getPageNumber(), page.getPageSize(), page.getTotalRow());