Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/models/Business/Goods/GoodsCommonService.php

@@ -825,10 +825,18 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         }
         $storeId && $where['han_goods_attribute.store_id'] = $storeId;
         $storeId || $where['source'] = 1; //来源：平台
-        $firstClassId && $where['gc_id_1'] = $firstClassId;
-        $secondClassId && $where['gc_id_2'] = $secondClassId;
-        $thirdClassId && $where['gc_id_3'] = $thirdClassId;
-        $storeThirdClassId && $where['goods_class_t_id'] = $storeThirdClassId;
+        if($keyword !== '') {
+            $firstClassId && $where['han_goods_attribute.gc_id_1'] = $firstClassId;
+            $secondClassId && $where['han_goods_attribute.gc_id_2'] = $secondClassId;
+            $thirdClassId && $where['han_goods_attribute.gc_id_3'] = $thirdClassId;
+            $storeThirdClassId && $where['han_goods_attribute.goods_class_t_id'] = $storeThirdClassId;
+        }else{
+            $firstClassId && $where['gc_id_1'] = $firstClassId;
+            $secondClassId && $where['gc_id_2'] = $secondClassId;
+            $thirdClassId && $where['gc_id_3'] = $thirdClassId;
+            $storeThirdClassId && $where['goods_class_t_id'] = $storeThirdClassId;
+        }
+
         $where['is_filter'] = 1;
         $productData = [];
         $attributeRedis = \Redis\Db4\GoodsAttributeRedisModel::getInstance();