Prechádzať zdrojové kódy

列表加上page_size

kely 7 mesiacov pred
rodič
commit
165b318a3c

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

@@ -37,13 +37,13 @@ class CompanyController extends Controller
 {
     public function index(Request $request)
     {
-
+        $pageSize=$request->get('page_size') ?? 10;
         if(Auth::user()->super_admin){
-            $company=Company::query()->filter($request->all())->paginate(10);
+            $company=Company::query()->filter($request->all())->paginate($pageSize);
             return CompanyResource::collection($company);
         }else{
             $companyId=Auth::user()->company->id;
-            $company=Company::query()->filter($request->all())->where('id',$companyId)->paginate(10);
+            $company=Company::query()->filter($request->all())->where('id',$companyId)->paginate($pageSize);
             return CompanyResource::collection($company);
         }
 

+ 5 - 3
app/Http/Controllers/API/ProjectController.php

@@ -454,6 +454,7 @@ class ProjectController extends Controller
 
     public function requirement(Request $request,string $id)
     {
+        $pageSize=$request->get('page_size') ?? 10;
         $project = Project::allowed($id)->findOrFail($id);
 
         // 初始化 requirements 的查询构建器
@@ -477,17 +478,18 @@ class ProjectController extends Controller
 
         $requirements = $requirementsQuery
             ->with(['createdBy']) // 预加载 createdBy 关联
-            ->paginate(10);
+            ->paginate($pageSize);
 
         return ProjectRequirementResource::collection($requirements);
     }
 
-    public function notLinkAssetRequirement(string $id)
+    public function notLinkAssetRequirement(Request $request,string $id)
     {
+        $pageSize=$request->get('page_size') ?? 10;
         $project = Project::allowed($id)->findOrFail($id);;
 
         $requirements = $project->assets
-            ? Requirement::query()->whereIn('asset_id', $project->assets?->pluck('id')->toArray())->whereNotIn('id', $project->requirements?->pluck('id')->toArray())->paginate(10)
+            ? Requirement::query()->whereIn('asset_id', $project->assets?->pluck('id')->toArray())->whereNotIn('id', $project->requirements?->pluck('id')->toArray())->paginate($pageSize)
             : [];
 
         return AssetRequirementResource::collection($requirements);

+ 2 - 1
app/Http/Controllers/API/RequirementController.php

@@ -39,11 +39,12 @@ class RequirementController extends Controller
      */
     public function index(Request $request)
     {
+        $pageSize=$request->get('page_size') ?? 10;
         $requirements = Requirement::filter($request->all())
             ->where('company_id',Auth::user()->company_id)
             ->orderBy('created_at', $request->input('sort','desc'))
             ->with(['createdBy', 'plan','group','asset.parent','projects'])
-            ->paginate($request->get('page_size') ?? 10);
+            ->paginate($pageSize);
 
         return AssetRequirementResource::collection($requirements);
     }

+ 2 - 1
app/Http/Controllers/API/SystemOperationLogController.php

@@ -11,10 +11,11 @@ class SystemOperationLogController extends Controller
 {
     public function index(Request $request)
     {
+        $pageSize=$request->get('page_size') ?? 10;
         $logs = SystemOperationLog::with(['user'])
             ->orderByDesc("request_at")
             ->filter($request->all())
-            ->paginate(10);
+            ->paginate($pageSize);
 
         return SystemOperationLogResource::collection($logs);
     }

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

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