wesmiler 报恩寺项目提交

app/Http/Controllers/Api/v1/ArticleController.php

@@ -50,6 +50,7 @@ class ArticleController extends BaseController
     public function my(){
         $params = request()->all();
         $params['user_id'] = $this->userId;
+        $params['status'] = [1,2,3];
         return $this->service->getDataList($params);
     }
 

app/Services/ArticleService.php

@@ -146,7 +146,14 @@ class ArticleService extends BaseService
         $dataList = $this->model::from('article as a')
             ->leftJoin('article_cates as c', 'a.cate_id', '=', 'c.id')
             ->where(function ($query) use ($params) {
-                $query->where(['a.mark'=>1,'a.status'=> 1]);
+                $query->where(['a.mark'=>1]);
+                $status = isset($params['status'])? $params['status'] : 0;
+                if($status){
+                    $status = is_array($status)? $status : [$status];
+                    $query->whereIn('a.status', $status);
+                }else{
+                    $query->where('a.status', 1);
+                }
                 $keyword = isset($params['keyword']) ? trim($params['keyword']) : '';
                 $cateId = isset($params['cate_id']) ? intval($params['cate_id']) : 0;
                 if ($cateId > 0) {