20220920 fix 後台匯出功能

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

@@ -23,19 +23,37 @@ class SignupManagementService
     {
         // 調用資料庫(或者其他業務邏輯)
         $res = $this->signupDb
-            ->select('*');
+            ->select('*')
+                
+                ->where('trackNo','LIKE', $trackNo.'%')
+                ->where(function($query)
+                    {
+                        $query->where('createDate', '>', $createDateStart)
+                            ->where('createDate', '<', $createDateFinal);
+                    })
+                ->where(function($query)
+                    {
+                        $query->where('firstName', $keyword)
+                        ->orWhere('lastName', $keyword)
+                        ->orWhere('companyName', $keyword)
+                        ->orWhere('companyEmail', $keyword)
+                        ->orWhere('backupEmail', $keyword)
+                        ->orWhere('phoneNumber', $keyword);
+                    }
+                );
             
-        $res->where('firstName', $keyword)
-            ->orWhere('lastName', $keyword)
-            ->orWhere('companyName', $keyword)
-            ->orWhere('companyEmail', $keyword)
-            ->orWhere('backupEmail', $keyword)
-            ->orWhere('phoneNumber', $keyword);
-
-        $res->where('trackNo','LIKE', $trackNo.'%')
-            ->where('createDate', '>', $createDateStart)
-            ->where('createDate', '<', $createDateFinal);
-                        
+            
+            // ->where('trackNo','LIKE', $trackNo.'%')
+            // ->where('createDate', '>', $createDateStart)
+            // ->where('createDate', '<', $createDateFinal)
+                                
+            // ->where('firstName', $keyword)
+            // ->orWhere('lastName', $keyword)
+            // ->orWhere('companyName', $keyword)
+            // ->orWhere('companyEmail', $keyword)
+            // ->orWhere('backupEmail', $keyword)
+            // ->orWhere('phoneNumber', $keyword);
+    
         // 取總筆數
         $cnt = $res->count();
         // 排序
@@ -62,16 +80,17 @@ class SignupManagementService
 
         $res = $this->signupDb
             ->select('*')
+            
+            ->where('createDate', '>', $createDateStart)
+            ->where('createDate', '<', $createDateFinal)
+        
             ->where('trackNo','LIKE', $trackNo.'%')
             ->where('firstName', $keyword)
             ->orWhere('lastName', $keyword)
             ->orWhere('companyName', $keyword)
             ->orWhere('companyEmail', $keyword)
             ->orWhere('backupEmail', $keyword)
-            ->orWhere('phoneNumber', $keyword)
-        
-            ->where('createDate', '>', $createDateStart)
-            ->where('createDate', '<', $createDateFinal);
+            ->orWhere('phoneNumber', $keyword);
         
         $res = $this->signupDb
             ->get()