From 108452cdf79aeff0b1b2595cb369fd54dc915399 Mon Sep 17 00:00:00 2001 From: xiangwb Date: Fri, 9 Mar 2018 19:07:39 +0800 Subject: [PATCH] merge --- boot-service/src/main/java/com/xwbing/util/PageUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 0e25516..4510363 100644 --- a/boot-service/src/main/java/com/xwbing/util/PageUtil.java +++ b/boot-service/src/main/java/com/xwbing/util/PageUtil.java @@ -12,12 +12,12 @@ public class PageUtil { int size = list.size(); pageMap.put("count", size); int totalPage; - if(size==0){ + if (size == 0) { pageMap.put("data", Collections.emptyList()); - totalPage=0; - }else { + totalPage = 0; + } else { int start = (currentPage - 1) * pageSize; - start=start>size?size:start; + start = start > size ? size : start; // if (start >= size) { // pageMap.put("data", Collections.emptyList()); // }