投票搜索框

app/JsonRpc/NewsService.php

@@ -908,15 +908,34 @@ class NewsService implements NewsServiceInterface
      */
     public function getSurveyList(array $data): array
     {
-        $result = Article::where('is_survey',1)
-        // ->select('id','survey_id','survey_type')
-        ->orderByDesc('updated_at')
+        $where = [];
+        if(isset($data['survey_name']) &&!empty($data['survey_name'])){
+            array_push($where,['survey_name','like','%'.$data['survey_name'].'%']);
+        }
+        if(isset($data['survey_type']) && $data['survey_type'] != null){
+            array_push($where,['survey_type','=',$data['survey_type']]);
+        }
+        if(isset($data['is_survey']) && $data['is_survey'] != null){
+            array_push($where,['is_survey','=',$data['is_survey']]);
+        }
+        // return Result::success($where);
+        if(!empty($where)){
+            $query = Article::where($where)->whereNotNull('survey_name');
+        }else{
+            $query = Article::whereNotNull('survey_name');
+        }
+        $count = $query->count();
+        $survey = $query->orderByDesc('id')
         ->limit($data['pageSize'])
         ->offset(($data['page']-1)*$data['pageSize'])
         ->get();
-        if(empty($result)){
-            return Result::error("暂无调查问卷",0);
+        if(empty($survey->toArray())){
+            return Result::error("暂无调查问卷!",0);
         }
+        $result = [
+            'rows'=>$survey,
+            'count'=>$count
+        ];
         return Result::success($result);
     }
     /**

runtime/hyperf.pid

@@ -0,0 +1 @@
+34601