From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java
index 9aba216..619f84f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java
@@ -39,7 +39,8 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, PrintWriter out) {
+ public void query(String callback, Integer pageIndex, Integer pageSize, String key, Long cid,
+ PrintWriter out) {
try {
@@ -49,15 +50,19 @@
if (pageSize == null)
pageSize = Constant.PAGE_SIZE;
+ if (cid != null && cid == 0) {
+ cid = null; // 鏌ヨ鍏ㄩ儴
+ }
+
List<HelpCenter> helpCenterList =
- helpCenterService.queryIdAndTitle((pageIndex - 1) * pageSize, pageSize, key, null);
+ helpCenterService.queryIdAndTitle((pageIndex - 1) * pageSize, pageSize, key, cid);
if (helpCenterList == null || helpCenterList.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
return;
}
- long count = helpCenterService.countQuery(key, null);
+ long count = helpCenterService.countQuery(key, cid);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
--
Gitblit v1.8.0