diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java index faad6599..93a0b90a 100644 --- a/litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java @@ -1,6 +1,9 @@ package org.linlinjava.litemall.core.util; +import com.github.pagehelper.Page; + import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -52,12 +55,19 @@ public class ResponseUtil { return obj; } - public static Object ok(String errmsg, Object data) { - Map obj = new HashMap(); - obj.put("errno", 0); - obj.put("errmsg", errmsg); - obj.put("data", data); - return obj; + public static Object okList(List list) { + Map data = new HashMap(); + data.put("list", list); + + if (list instanceof Page) { + Page page = (Page) list; + data.put("total", page.getTotal()); + } + else{ + data.put("total", list.size()); + } + + return ok(data); } public static Object fail() {