From c573834c796cc77057455ef0b3d8d0412f9792b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 二月 2019 14:51:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/help/HelpCenterServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/help/HelpCenterServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/help/HelpCenterServiceImpl.java
index b5add51..a70c00e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/help/HelpCenterServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/help/HelpCenterServiceImpl.java
@@ -228,20 +228,21 @@
}
@Override
- public List<HelpCenter> query(int pageIndex, int pageSize, String key, Integer orderMode) throws HelpCenterException {
- return helpCenterMapper.query(pageIndex, pageSize, key, orderMode);
+ public List<HelpCenter> query(int pageIndex, int pageSize, String key, Long cid, Integer orderMode) throws HelpCenterException {
+ return helpCenterMapper.query(pageIndex, pageSize, key, cid, orderMode);
}
@Override
- public long countQuery(String key) throws HelpCenterException {
- return helpCenterMapper.countQuery(key);
+ public long countQuery(String key, Long cid) throws HelpCenterException {
+ return helpCenterMapper.countQuery(key, cid);
}
@Override
- @Cacheable(value = "helpCenterCache",key="'queryIdAndTitle-'+#pageIndex+'-'+#key")
- public List<HelpCenter> queryIdAndTitle(int pageIndex, int pageSize, String key) throws HelpCenterException {
- return helpCenterMapper.queryIdAndTitle(pageIndex, pageSize, key);
+ @Cacheable(value = "helpCenterCache",key="'queryIdAndTitle-'+#pageIndex+'-'+#key+'-'+#cid")
+ public List<HelpCenter> queryIdAndTitle(int pageIndex, int pageSize, String key, Long cid)
+ throws HelpCenterException {
+ return helpCenterMapper.queryIdAndTitle(pageIndex, pageSize, key, cid);
}
@Override
--
Gitblit v1.8.0