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

gx



查看合并请求 !742

@@ -219,7 +219,11 @@ class BlogLogic extends BaseLogic
             if($v == 3){
                 $data[$k] = $this->model->where(['project_id'=>$this->user['project_id']])->count();
             }else{
-                $data[$k] = $this->model->where(['status'=>$v,'project_id'=>$this->user['project_id']])->count();
+                if($v == 0){
+                    $data[$k] = $this->model->formatQuery(['status' => ['in',[0,3]], 'project_id' => $this->user['project_id']])->count();
+                }else{
+                    $data[$k] = $this->model->where(['status' => $v, 'project_id' => $this->user['project_id']])->count();
+                }
             }
         }
         return $this->success($data);

@@ -236,9 +236,13 @@ class NewsLogic extends BaseLogic
             if ($v == 3) {
                 $data[$k] = $this->model->where(['project_id' => $this->user['project_id']])->count();
             } else {
+                if($v == 0){
+                    $data[$k] = $this->model->formatQuery(['status' => ['in',[0,3]], 'project_id' => $this->user['project_id']])->count();
+                }else{
                     $data[$k] = $this->model->where(['status' => $v, 'project_id' => $this->user['project_id']])->count();
                 }
             }
+        }
         return $this->success($data);
     }