Merge pull request #2041 from visuddhinanda/laravel

支持跨章节翻页

app/Http/Controllers/NavArticleController.php

@@ -51,16 +51,18 @@ class NavArticleController extends Controller
         }
         $data = array();
         $data['curr'] = new ArticleMapResource($curr);
-        $prev = ArticleCollection::where('id','<',$curr->id)
+        $prev = ArticleCollection::where('collect_id',$id[1])
+                                ->where('id','<',$curr->id)
                                 ->orderBy('id','desc')
                                 ->first();
-        if($prev && $prev->level === $curr->level){
+        if($prev){
             $data['prev'] = new ArticleMapResource($prev);
         }
-        $next = ArticleCollection::where('id','>',$curr->id)
-                ->orderBy('id')
-                ->first();
-        if($next && $next->level === $curr->level){
+        $next = ArticleCollection::where('collect_id',$id[1])
+                                ->where('id','>',$curr->id)
+                                ->orderBy('id')
+                                ->first();
+        if($next){
             $data['next'] = new ArticleMapResource($next);
         }
         return $this->ok($data);

app/Http/Controllers/UserController.php

@@ -28,7 +28,10 @@ class UserController extends Controller
                 break;
         }
         if($request->has("search")){
-            $table->where('nickname', 'like', $request->get("search")."%");
+            $table = $table->where('nickname', 'like', "%".$request->get("search")."%");
+        }
+        if($request->has("role")){
+            $table = $table->whereJsonContains('role',$request->get('role'));
         }
         $count = $table->count();
         $table = $table->orderBy($request->get('order','username'),