From 21f49216736c547d99ec1dd46a24c6f43f852fc5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 05 十二月 2018 10:37:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
index 2a0da58..2a60376 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
@@ -85,8 +85,11 @@
return;
}
+ int pageSize = Constant.PAGE_SIZE;
+
int count = configService.getCount(key, pageIndex);
- PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count);
+ int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+ PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
JSONObject data = new JSONObject();
data.put("pe", pe);
--
Gitblit v1.8.0