From f6fd65aa6a8518f237729888044c14809d337d30 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Fri, 9 Mar 2018 19:05:49 +0800
Subject: [PATCH] merge

---
 .../src/main/java/com/xwbing/demo/demo.java   |  9 ++++++++
 .../main/java/com/xwbing/util/PageUtil.java   | 22 +++++++++++--------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/demo/demo.java b/boot-service/src/main/java/com/xwbing/demo/demo.java
index df4ddf0..bcc680f 100644
--- a/boot-service/src/main/java/com/xwbing/demo/demo.java
+++ b/boot-service/src/main/java/com/xwbing/demo/demo.java
@@ -1,5 +1,10 @@
 package com.xwbing.demo;
 
+import com.xwbing.domain.entity.sys.SysUser;
+
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 项目名称: boot-module-demo
  * 创建时间: 2018/1/23 14:45
@@ -8,6 +13,10 @@ package com.xwbing.demo;
  */
 public class demo {
     public static void main(String[] args) {
+        SysUser sysUser=new SysUser();
+        Map<String, Object> stringObjectHashMap = new HashMap<>();
+        Object o = stringObjectHashMap.get(sysUser.getAdmin());
+        System.out.println("");
 
 
     }
diff --git a/boot-service/src/main/java/com/xwbing/util/PageUtil.java b/boot-service/src/main/java/com/xwbing/util/PageUtil.java
index 2a3322b..0e25516 100644
--- a/boot-service/src/main/java/com/xwbing/util/PageUtil.java
+++ b/boot-service/src/main/java/com/xwbing/util/PageUtil.java
@@ -1,9 +1,6 @@
 package com.xwbing.util;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 作者: xiangwb
@@ -14,13 +11,20 @@ public class PageUtil {
         Map<String, Object> pageMap = new HashMap<>();
         int size = list.size();
         pageMap.put("count", size);
-        int start = (currentPage - 1) * pageSize;
-        if (start >= size) {
+        int totalPage;
+        if(size==0){
             pageMap.put("data", Collections.emptyList());
+            totalPage=0;
+        }else {
+            int start = (currentPage - 1) * pageSize;
+            start=start>size?size:start;
+//            if (start >= size) {
+//                pageMap.put("data", Collections.emptyList());
+//            }
+            int end = pageSize * currentPage > size ? size : pageSize * currentPage;
+            pageMap.put("data", list.subList(start, end));
+            totalPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1;
         }
-        int end = pageSize * currentPage > size ? size : pageSize * currentPage;
-        pageMap.put("data", list.subList(start, end));
-        int totalPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1;
         pageMap.put("totalPage", totalPage);
         return pageMap;
     }