merge

boot-service/src/main/java/com/xwbing/demo/demo.java

@@ -10,5 +10,7 @@ import java.util.concurrent.ExecutionException;
  */
 public class demo {
     public static void main(String[] args) throws ExecutionException, InterruptedException {
-        int i = "222".compareTo("11111");
+        int i = "222".compareTo("222");
         System.out.println(i);
+    }
+}

boot-service/src/main/java/com/xwbing/util/PageUtil.java

@@ -11,20 +11,18 @@ import java.util.Map;
  * 说明: 列表分页工具类
  */
 public class PageUtil {
+    private int start;
+
     public static Map<String, Object> page(JSONArray array, int currentPage, int pageSize) {
         Map<String, Object> pageMap = new HashMap<>();
         int size = array.size();
         pageMap.put("count", size);
         int start = (currentPage - 1) * pageSize;
-        int end = pageSize * currentPage;
-        if (start >= end || start >= size) {
+        if (start >= size) {
             pageMap.put("data", Collections.emptyList());
-        } else {
-            if (start < size && end > size) {
-                end = size;
-            }
-            pageMap.put("data", array.subList(start, end));
         }
+        int end = pageSize * currentPage>size?size:pageSize * currentPage;
+        pageMap.put("data", array.subList(start, end));
         int totalPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1;
         pageMap.put("totalPage", totalPage);
         return pageMap;