From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
index 1d1ff4d..a3158d8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
@@ -257,9 +257,14 @@
@Cacheable(value = "brandCache", key = "'listEffectiveCache-'+#page+'-'+#cid")
public JSONObject listEffectiveCache(int page, Long cid) {
long countShop = 0;
+
+ if (cid != null && cid <= 0) {
+ cid = null;
+ }
+
List<TaoBaoShop> listShop = new ArrayList<TaoBaoShop>();
// 绗竴椤� 鏌ヨ鍏ㄩ儴鍒嗙被涓嬪簵閾�
- if (page == 1 && cid != null && cid > 0 ) {
+ if (page == 1 && cid != null) {
List<BrandClassShop> list = brandClassShopMapper.listEffective(cid);
if (list == null) {
list = new ArrayList<BrandClassShop>();
--
Gitblit v1.8.0