|
|
@@ -83,7 +83,15 @@ class GoodsService extends BaseService
|
|
|
|
|
|
$cateId = isset($params['cate_id']) ? intval($params['cate_id']) : 0;
|
|
|
if ($cateId > 0) {
|
|
|
- $query->where('a.cate_id', $cateId);
|
|
|
+ $subIds = GoodsCategoryModel::where(['pid'=> $cateId,'mark'=>1,'status'=>1])->pluck('cate_id');
|
|
|
+ $query->where(function($query) use($cateId,$subIds){
|
|
|
+ if($subIds){
|
|
|
+ $query->whereIn('a.cate_id', $subIds)
|
|
|
+ ->orWhere('a.cate_id', $cateId);
|
|
|
+ }else{
|
|
|
+ $query->where('a.cate_id', $cateId);
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
})
|