20220920 fix 後台匯出功能

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

@@ -25,20 +25,12 @@ class SignupManagementService
         $res = $this->signupDb
             ->select('*');
             
-        if ($keyword){
-
-            $res->where('firstName', $keyword)
-                ->orWhere('lastName', $keyword)
-                ->orWhere('companyName', $keyword)
-                ->orWhere('companyEmail', $keyword)
-                ->orWhere('backupEmail', $keyword)
-                ->orWhere('phoneNumber', $keyword);
-                // ->orWhere('country', $keyword)
-                // ->orWhere('trackNo', $keyword)
-                // ->orWhere('typeOfIndustry', $keyword)
-                // ->orWhere('typeOfJob', $keyword)
-                // ->orWhere('jobTitle', $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)
@@ -69,34 +61,17 @@ class SignupManagementService
         \Log::info('createDateFinal: '.$createDateFinal);
 
         $res = $this->signupDb
-            ->select('*');
-            
-        if ($trackNo!="") {
-            
-            \Log::info('trackNo123');
-            $res->where('trackNo','LIKE', $trackNo.'%');
-        }
+            ->select('*')
+            ->where('trackNo','LIKE', $trackNo.'%')
+            ->where('firstName', $keyword)
+            ->orWhere('lastName', $keyword)
+            ->orWhere('companyName', $keyword)
+            ->orWhere('companyEmail', $keyword)
+            ->orWhere('backupEmail', $keyword)
+            ->orWhere('phoneNumber', $keyword)
         
-        if ($keyword!=""){
-            
-            $res->where('firstName', $keyword)
-                ->orWhere('lastName', $keyword)
-                ->orWhere('companyName', $keyword)
-                ->orWhere('companyEmail', $keyword)
-                ->orWhere('backupEmail', $keyword)
-                ->orWhere('phoneNumber', $keyword);
-                // ->orWhere('country', $keyword)
-                // ->orWhere('trackNo', $keyword)
-                // ->orWhere('typeOfIndustry', $keyword)
-                // ->orWhere('typeOfJob', $keyword)
-                // ->orWhere('jobTitle', $keyword);
-        }
-        
-        if ($createDateStart!="" && $createDateFinal!="") {
-            \Log::info('date123');
-            $res->where('createDate', '>', $createDateStart)
-                ->where('createDate', '<', $createDateFinal);
-        }
+            ->where('createDate', '>', $createDateStart)
+            ->where('createDate', '<', $createDateFinal);
         
         $res = $this->signupDb
             ->get()