Эх сурвалжийг харах

用户,公司列表添加分页

kely 7 сар өмнө
parent
commit
60da520123

+ 2 - 2
app/Http/Controllers/API/CompanyController.php

@@ -39,11 +39,11 @@ class CompanyController extends Controller
     {
 
         if(Auth::user()->super_admin){
-            $company=Company::query()->filter($request->all())->get();
+            $company=Company::query()->filter($request->all())->paginate(10);
             return CompanyResource::collection($company);
         }else{
             $companyId=Auth::user()->company->id;
-            $company=Company::query()->filter($request->all())->where('id',$companyId)->get();
+            $company=Company::query()->filter($request->all())->where('id',$companyId)->paginate(10);
             return CompanyResource::collection($company);
         }
 

+ 2 - 2
app/Http/Controllers/API/UserController.php

@@ -71,13 +71,13 @@ class UserController extends Controller
         $sort=$request->input('sort','desc');
         //超管能看到所有用户
         if(Auth::user()->super_admin){
-            $user = User::query()->filter($request->all())->orderBy('created_at',$sort)->paginate();
+            $user = User::query()->filter($request->all())->orderBy('created_at',$sort)->paginate(10);
             return UserSimpleResource::collection($user);
         }
         //普通管理员能看到自己公司的用户
         $user=User::query()
             ->where('company_id',Auth::user()->company_id)
-            ->filter($request->all())->orderBy('created_at',$sort)->paginate();
+            ->filter($request->all())->orderBy('created_at',$sort)->paginate(10);
         return UserSimpleResource::collection($user);
     }