合并分支 'zhl' 到 'master'

修改排序和显示结果



查看合并请求 !2320

@@ -44,12 +44,13 @@ class GeoQuestionResLogic extends BaseLogic
     public function getResultList($map = [],$page = 1,$row = 20,$order = 'id'){
     public function getResultList($map = [],$page = 1,$row = 20,$order = 'id'){
         $filed = ['id','project_id','question_id','platform','question','keywords','url','created_at','updated_at'];
         $filed = ['id','project_id','question_id','platform','question','keywords','url','created_at','updated_at'];
         $result = GeoQuestionResult::select($filed)
         $result = GeoQuestionResult::select($filed)
+            ->where(['project_id' => $map['project_id']])
             ->where(function($query) {
             ->where(function($query) {
                 $query->where('keywords', '!=', '[]')
                 $query->where('keywords', '!=', '[]')
                     ->orWhere('url', '!=', '[]');
                     ->orWhere('url', '!=', '[]');
             })
             })
             ->orderByRaw('LENGTH(question) ASC')
             ->orderByRaw('LENGTH(question) ASC')
-            ->get();
+            ->paginate($row, $filed, 'page', $page);
         $data = empty($result) ? [] : $result->toArray();
         $data = empty($result) ? [] : $result->toArray();
 
 
 //        $filed = ['id','project_id','question_id','platform','question','keywords','url','created_at','updated_at'];
 //        $filed = ['id','project_id','question_id','platform','question','keywords','url','created_at','updated_at'];