gq 8 years ago
parent
commit
03d0359abe
1 changed files with 8 additions and 3 deletions
  1. 8 3
      server/app/Http/Controllers/Api/V1/IndexController.php

+ 8 - 3
server/app/Http/Controllers/Api/V1/IndexController.php

@@ -146,9 +146,14 @@ class IndexController extends Controller
         $user = $this->getUser();
         $user = $this->getUser();
         $keyword ='%'.$request->keyword.'%';
         $keyword ='%'.$request->keyword.'%';
         $user_infos = UserInfoModel::where('nickname','like',$keyword)->get();
         $user_infos = UserInfoModel::where('nickname','like',$keyword)->get();
-        $query = DreamInfoModel::where('end_time','<=',time())->where('name','like',$keyword)->
-            orWhere('sign','like',$keyword);
-        $dream_infos =$query->with(['img','user'])->get();
+        $dream_infos =  DreamInfoModel::where(function ($query) use($keyword) {
+            $query->where('name','like',$keyword)
+                ->where('end_time','<=',time());
+        })
+        ->orWhere(function ($query) use($keyword){
+            $query->where('sign','like',$keyword)
+                ->where('end_time','<=',time());
+        })->get();
         $signs  = BaseSettingsModel::where('category','sign')->where('value','like',$keyword)->get();
         $signs  = BaseSettingsModel::where('category','sign')->where('value','like',$keyword)->get();
         if (empty($request->keyword)) {
         if (empty($request->keyword)) {
 //            历史搜索
 //            历史搜索