20220921 fix 後台匯出功能

app/Http/Services/Backend/DataManagement/SignupManagementService.php

@@ -50,11 +50,9 @@ class SignupManagementService
         // 取總筆數
         $cnt = $res->count();
         // 排序
-        $res = $res
-            ->orderByRaw((int)$orderColumn . ' ' . $orderDir);
+        $res = $res->orderByRaw((int)$orderColumn . ' ' . $orderDir);
         // 分頁
-        $res = $res
-            ->skip($start)->take($length);
+        $res = $res->skip($start)->take($length);
         // 實際取資料
         $result = $res
             ->get()
@@ -70,10 +68,6 @@ class SignupManagementService
         $res = $this->signupDb
             ->select('*');
             
-        if ($trackNo) {
-            $res = $res->where('trackNo','LIKE', $trackNo.'%');
-        }
-            
         if ($keyword) {
             $res->where(function($q) use ($keyword) {
                 $q->where('firstName', $keyword)
@@ -84,7 +78,11 @@ class SignupManagementService
                     ->orWhere('phoneNumber', $keyword);
             });
         }
-        
+           
+        if ($trackNo) {
+            $res = $res->where('trackNo','LIKE', $trackNo.'%');
+        }
+         
         if ($createDateStart && $createDateFinal) {
             
             $res = $res->where('createDate', '>', $createDateStart)