20220921 fix 後台匯出功能

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

@@ -34,23 +34,12 @@ class SignupManagementService
                     ->orWhere('backupEmail', $keyword)
                     ->orWhere('phoneNumber', $keyword);
             });
-            // $res = $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 ($trackNo) {
-            \Log::info($trackNo);
             $res = $res->where('trackNo','LIKE', $trackNo.'%');
         }
+
         if ($createDateStart && $createDateFinal) {
             
             $res = $res->where('createDate', '>', $createDateStart)
@@ -77,41 +66,31 @@ class SignupManagementService
 
     public function getExportList($keyword, $trackNo, $createDateStart, $createDateFinal)
     {
-        \Log::info('keyword: '.$keyword);
-        \Log::info('trackNo: '.$trackNo);
-        \Log::info('createDateStart: '.$createDateStart);
-        \Log::info('createDateFinal: '.$createDateFinal);
 
         $res = $this->signupDb
             ->select('*');
             
-        if ($trackNo!="") {
-            
-            \Log::info('trackNo123');
+        if ($trackNo) {
             $res = $res->where('trackNo','LIKE', $trackNo.'%');
         }
-        
-        if ($keyword!=""){
             
-            $res = $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 ($keyword) {
+            $res->where(function($q) use ($keyword) {
+                $q->where('firstName', $keyword)
+                    ->orWhere('lastName', $keyword)
+                    ->orWhere('companyName', $keyword)
+                    ->orWhere('companyEmail', $keyword)
+                    ->orWhere('backupEmail', $keyword)
+                    ->orWhere('phoneNumber', $keyword);
+            });
         }
         
-        // if ($createDateStart!="" && $createDateFinal!="") {
-            // \Log::info('date123');
+        if ($createDateStart && $createDateFinal) {
+            
             $res = $res->where('createDate', '>', $createDateStart)
-                        ->where('createDate', '<', $createDateFinal);
-        // }
-        
+                ->where('createDate', '<', $createDateFinal);
+        }
+
         $res = $this->signupDb
             ->get()
             ->toArray();