Forráskód Böngészése

审批流列表,审批流设置列表,命名规则列表加上分页限制数量

kely 7 hónapja
szülő
commit
97785f9272

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

@@ -31,6 +31,7 @@ class ApprovalController extends Controller
      */
     public function index(Request $request)
     {
+        $pageSize=$request->get('page_size') ?? 10;
         $query = Approval::with(['createdBy']);
 
         match ($request->get("tab")) {
@@ -39,7 +40,7 @@ class ApprovalController extends Controller
             default => $query->allowed(),
         };
 
-        $approvals = $query->filter($request->all())->orderByDesc("created_at")->paginate();
+        $approvals = $query->filter($request->all())->orderByDesc("created_at")->paginate($pageSize);
 
         return new ApprovalCollection($approvals);
     }

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

@@ -14,9 +14,10 @@ use Illuminate\Support\Facades\Auth;
 
 class ApprovalFlowController extends Controller
 {
-    public function index()
+    public function index(Request $request)
     {
-        $approvalFlows = ApprovalFlow::query()->with(['createdBy'])->orderByDesc("id")->paginate();
+        $pageSize=$request->get('page_size') ?? 10;
+        $approvalFlows = ApprovalFlow::query()->with(['createdBy'])->orderByDesc("id")->paginate($pageSize);
 
         return ApprovalFlowResource::collection($approvalFlows);
     }

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

@@ -24,7 +24,8 @@ class NameRuleController extends Controller
      */
     public function index(Request $request)
     {
-        $namingRules = NamingRule::allowed()->with(['company'])->filter($request->all())->paginate();
+        $pageSize=$request->get('page_size') ?? 10;
+        $namingRules = NamingRule::allowed()->with(['company'])->filter($request->all())->paginate($pageSize);
 
         return NamingRuleResource::collection($namingRules);
     }

+ 4 - 4
app/ModelFilters/DepartmentFilter.php

@@ -15,10 +15,10 @@ class DepartmentFilter extends ModelFilter
 {
     public $relations = [];
 
-    public function id($id): ModelFilter{
-        return $this->where('id',$id);
-    }
-    public function name($name): ModelFilter
+//    public function id($id): ModelFilter{
+//        return $this->where('id',$id);
+//    }
+    public function name($name)
     {
         return $this->where('name', 'like', "%$name%");
     }