From 559e188de93bb05d6c37ec1a0d392ec69ed02567 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期二, 20 十一月 2018 10:41:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushRecordAdminController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushRecordAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushRecordAdminController.java
index 3b13910..2de9c5b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushRecordAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushRecordAdminController.java
@@ -64,9 +64,13 @@
return;
}
- int count = pushRecordService.getCount(key, type, pageIndex);
- PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count);
+ int pageSize = Constant.PAGE_SIZE;
+ int count = pushRecordService.getCount(key, type, pageIndex);
+
+ 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);
data.put("result_list", list);
--
Gitblit v1.8.0