Merge branch 'dev' of http://47.244.231.31:8099/zhl/globalso-v6 into dev

@@ -34,7 +34,7 @@ class ProductController extends BaseController
             $ids = CategoryRelated::where('cate_id', $this->param['category_id'])->pluck('product_id')->toArray();
             $ids = CategoryRelated::where('cate_id', $this->param['category_id'])->pluck('product_id')->toArray();
             $map[] =  ['id', 'in', $ids];
             $map[] =  ['id', 'in', $ids];
         }
         }
-        if(!empty($this->param['status'])){
+        if(isset($this->param['status'])){
             $map[] =  ['status', $this->param['status']];
             $map[] =  ['status', $this->param['status']];
         }
         }
         $sort = ['id' => 'desc'];
         $sort = ['id' => 'desc'];