问题件置顶问题

app/Http/Controllers/OrderIssueController.php

@@ -42,6 +42,7 @@ class OrderIssueController extends Controller
         if (!Gate::allows('订单管理-问题件-查询')) {
             return redirect(url('/'));
         }
+        /** @var OrderIssueService $orderIssueService */
         $orderIssueService = app('orderIssueService');
         $owners = Owner::all();
         $orderIssues = $orderIssueService->paginate($request->all());

app/Services/OrderIssueService.php

@@ -45,7 +45,10 @@ class OrderIssueService
         }])->whereHas('order.owner', function ($query) use ($owner_ids) {
             $query->whereIn('id', $owner_ids);
         });
-
+        $query->selectRaw('order_issues.* ,order_issue_on_tops.id top_id ,order_issue_on_tops.remark,order_issue_on_tops.updated_at top_update')
+            ->leftJoin('order_issue_on_tops', 'order_issue_on_tops.order_issue_id', '=', 'order_issues.id')
+            ->whereNull('order_issue_on_tops.deleted_at')
+            ->orderBy('order_issue_on_tops.updated_at', 'desc');
         $query->orderBy('order_issues.id', 'desc');
         return $query;
     }
@@ -238,11 +241,7 @@ class OrderIssueService
 
     public function paginate(array $arr)
     {
-        $query = $this->getConditionQuery($arr);
-        return $query->selectRaw('order_issues.* ,order_issue_on_tops.id top_id ,order_issue_on_tops.remark,order_issue_on_tops.updated_at top_update')
-            ->leftJoin('order_issue_on_tops', 'order_issue_on_tops.order_issue_id', '=', 'order_issues.id')
-            ->whereNull('order_issue_on_tops.deleted_at')
-            ->orderBy('order_issue_on_tops.updated_at', 'desc')->paginate($arr['paginate'] ?? 50);
+        return $query = $this->getConditionQuery($arr);
 
     }