From d60e90b02e7357ddddf15c79f4471ec8bca5117f Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Mon, 6 May 2019 14:25:29 +0800
Subject: [PATCH] =?UTF-8?q?chore[litemall-core]:=20=E6=95=B0=E7=BB=84?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=BB=9F=E4=B8=80=E8=B0=83=E6=95=B4=E6=88=90?=
 =?UTF-8?q?data=E7=9A=84list=E5=92=8Ctotal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../litemall/core/util/ResponseUtil.java      | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

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<String, Object> obj = new HashMap<String, Object>();
-        obj.put("errno", 0);
-        obj.put("errmsg", errmsg);
-        obj.put("data", data);
-        return obj;
+    public static Object okList(List list) {
+        Map<String, Object> data = new HashMap<String, Object>();
+        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() {