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

gx



查看合并请求 !2614

@@ -60,10 +60,10 @@ class GeoQuestionResLogic extends BaseLogic
             $map['keywords'] = ['like','%'.$map['keywords'].'%'];
             $map['keywords'] = ['like','%'.$map['keywords'].'%'];
         }
         }
         $query = $this->model->formatQuery($map);
         $query = $this->model->formatQuery($map);
-        $query = $query->where(function ($q) {
-            $q->whereRaw('JSON_LENGTH(keywords) > 0')
-                ->orWhereRaw('JSON_LENGTH(url) > 0');
-        });
+//        $query = $query->where(function ($q) {
+//            $q->whereRaw('JSON_LENGTH(keywords) > 0')
+//                ->orWhereRaw('JSON_LENGTH(url) > 0');
+//        });
         $data = $query->orderByRaw('CHAR_LENGTH(question) ASC')->paginate($row, $filed, 'page', $page);;
         $data = $query->orderByRaw('CHAR_LENGTH(question) ASC')->paginate($row, $filed, 'page', $page);;
         return $this->success($data);
         return $this->success($data);
     }
     }