20220920 fix 後台匯出功能

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

@@ -25,7 +25,7 @@ class SignupManagementService
         $res = $this->signupDb
             ->select('*');
             
-        if ($keyword){
+        if ($keyword) {
 
             $res = $res->where('firstName', $keyword)
                 ->orWhere('lastName', $keyword)
@@ -40,9 +40,16 @@ class SignupManagementService
                 // ->orWhere('jobTitle', $keyword);
         }
 
-        $res = $res->where('trackNo','LIKE', $trackNo.'%')
-            ->where('createDate', '>', $createDateStart)
-            ->where('createDate', '<', $createDateFinal);
+        if ($trackNo) {
+            
+            $res = $res->where('trackNo','LIKE', $trackNo.'%');
+        }
+        if ($createDateStart && $createDateFinal) {
+            
+            $res = $res->where('createDate', '>', $createDateStart)
+                ->where('createDate', '<', $createDateFinal);
+        }
+        
                         
         // 取總筆數
         $cnt = $res->count();
@@ -92,11 +99,11 @@ class SignupManagementService
                 // ->orWhere('jobTitle', $keyword);
         }
         
-        if ($createDateStart!="" && $createDateFinal!="") {
-            \Log::info('date123');
+        // if ($createDateStart!="" && $createDateFinal!="") {
+            // \Log::info('date123');
             $res = $res->where('createDate', '>', $createDateStart)
-                ->where('createDate', '<', $createDateFinal);
-        }
+                        ->where('createDate', '<', $createDateFinal);
+        // }
         
         $res = $this->signupDb
             ->get()