合并分支 'lyh-server' 到 'master'

gx检查日志



查看合并请求 !2016

@@ -489,11 +489,7 @@ class ProductLogic extends  BaseLogic
         foreach ($data as $k => $v){
         foreach ($data as $k => $v){
             $map = [];
             $map = [];
             $cateModel = new Category();
             $cateModel = new Category();
-            $status = [];
-            if($v != 3){
-                $status = ['status'=>$v];
-            }
-            $cateList = $cateModel->list($status,'id',['id','pid']);
+            $cateList = $cateModel->list(['status'=>1],'id',['id','pid']);
             $this->param['featured_status']  = $this->param['featured_status'] ?? 0;
             $this->param['featured_status']  = $this->param['featured_status'] ?? 0;
             if(!empty($cateList) && ($this->param['featured_status'] != $cateModel::STATUS_ACTIVE)){
             if(!empty($cateList) && ($this->param['featured_status'] != $cateModel::STATUS_ACTIVE)){
                 $featured_ids = $cateModel->formatQuery(['title'=>['in',['Featured','featured']]])->pluck('id')->toArray();
                 $featured_ids = $cateModel->formatQuery(['title'=>['in',['Featured','featured']]])->pluck('id')->toArray();