From 9e1db983254a475fd7a069937c3f706fe2efe9b4 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Feb 2018 11:41:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/common/bean/PageBean.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/common/bean/PageBean.java b/src/main/java/com/moral/common/bean/PageBean.java
index b0cb5db..01a6f9f 100644
--- a/src/main/java/com/moral/common/bean/PageBean.java
+++ b/src/main/java/com/moral/common/bean/PageBean.java
@@ -43,6 +43,9 @@
this.pages = page.getPages();
this.data= new ArrayList<>(list);
this.size = page.size();
+ }else{
+ this.data = list;
+ this.total = Integer.toUnsignedLong(list.size());
}
}
--
Gitblit v1.8.0