From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
index 698ff9a..3dac5f8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
@@ -174,9 +174,9 @@
}
@Override
- public List<SpecialCard> listQuery(long start, int count, String key, Integer sort) {
+ public List<SpecialCard> listQuery(long start, int count, String key, Integer sort, List<Long> listPid) {
- List<SpecialCard> listObj = specialCardMapper.listQuery(start, count, key);
+ List<SpecialCard> listObj = specialCardMapper.listQuery(start, count, key, listPid);
if (listObj == null || listObj.size() == 0) {
return null;
}
@@ -225,8 +225,8 @@
}
@Override
- public long countlistQuery(String key) {
- return specialCardMapper.countlistQuery(key);
+ public long countlistQuery(String key, List<Long> listPid) {
+ return specialCardMapper.countlistQuery(key, listPid);
}
@Override
--
Gitblit v1.8.0