From 60a099a7edfd81a3b10c766e113c019cdef6cd3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 五月 2020 16:08:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandInfoMapper.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandInfoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandInfoMapper.java
index b1d5dbe..e3e75d2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandInfoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandInfoMapper.java
@@ -5,7 +5,6 @@
import org.apache.ibatis.annotations.Param;
import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.brand.BrandClass;
import com.yeshi.fanli.entity.brand.BrandInfo;
import com.yeshi.fanli.vo.brand.BrandInfoVO;
@@ -19,10 +18,10 @@
* @param state
* @return
*/
- List<BrandInfo> listQuery(@Param("start") long start, @Param("count") int count, @Param("key") String key,
- @Param("cid")Long cid, @Param("state") Integer state);
+ List<BrandInfo> listQuery(@Param("start") long start, @Param("count") int count, @Param("keys") List<String> keys,
+ @Param("cid")Long cid, @Param("state") Integer state, @Param("showState")Integer showState);
- long countQuery(@Param("key") String key, @Param("cid") Long cid, @Param("state") Integer state);
+ long countQuery(@Param("keys") List<String> keys, @Param("cid") Long cid, @Param("state") Integer state, @Param("showState")Integer showState);
int deleteBatchByPrimaryKey(List<Long> list);
@@ -76,5 +75,19 @@
* @return
*/
long countValidByCidToApp(@Param("cid") Long cid);
-
+
+
+ BrandInfo selectByUniqueName(@Param("name") String name, @Param("cid") Long cid, @Param("id") Long id);
+
+
+
+ /**
+ * 鏌ヨ杩斿洖鍓嶇鍝佺墝
+ * @param start
+ * @param count
+ * @param cid
+ * @return
+ */
+ List<BrandInfoVO> listByAlikeName(@Param("key") String key);
+
}
\ No newline at end of file
--
Gitblit v1.8.0