打卡BUG

app/Http/Controllers/UserDutyCheckController.php

@@ -48,18 +48,21 @@ class UserDutyCheckController extends Controller
         $user_id = Cache::get('dutyCheckTokenStr_'.$userLaborToken);
         if ($userLaborToken && $user_id) {
             $userDetail = UserDetail::find($user_id);
-            if (!$userDetail) return redirect('personnel/checking-in/userDutyCheck/createUserDetail/' . $userDetail->mobile_phone)->with("importAndExportQRCodeType", $importAndExportQRCodeType);
-            if($importAndExportQRCodeType=='import') return redirect('personnel/checking-in/userDutyCheck/updateUserLaborCompanies/' . $userDetail->mobile_phone)->with("importAndExportQRCodeType", $importAndExportQRCodeType);
-            $userDutyCheck = $this->importAndExportDutyCheck($user_id, $importAndExportQRCodeType);
-            if ($userDutyCheck && $userDutyCheck->isNotImport == true) return "<h1 style='color: darkred;text-align:center'>当前还未入场，不可出场!</h1>";
-            if ($userDutyCheck && $userDutyCheck->import == true) return "<h1 style='color: darkred;text-align:center'>您已入场，不可再次入场!</h1>";
-            if ($userDutyCheck && $userDutyCheck->export == true) return "<h1 style='color: darkred;text-align:center'>您已出场，不可再次出场!!</h1>";
-            if (!$userDutyCheck) return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
-            $laborReportService = app('LaborReportService');
-            $errorMessage = $laborReportService->makeOrChangeLaborReportByUserDutyCheck($userDutyCheck, $importAndExportQRCodeType);
-            if ($errorMessage) return $errorMessage;
-            $laravelEchoPrefix = config('database.redis.options.prefix');
-            return response()->view('personnel/checking-in/importAndExportSuccess', ['full_name' => $userDetail->full_name, 'checked_at' => $userDutyCheck->checked_at, 'type' => $userDutyCheck->type, 'laravelEchoPrefix' => $laravelEchoPrefix]);
+            if($userDetail){
+//                if (!$userDetail) return redirect('personnel/checking-in/userDutyCheck/createUserDetail/' . $userDetail->mobile_phone)->with("importAndExportQRCodeType", $importAndExportQRCodeType);
+                if($importAndExportQRCodeType=='import') return redirect('personnel/checking-in/userDutyCheck/updateUserLaborCompanies/' . $userDetail->mobile_phone)->with("importAndExportQRCodeType", $importAndExportQRCodeType);
+                $userDutyCheck = $this->importAndExportDutyCheck($user_id, $importAndExportQRCodeType);
+                if ($userDutyCheck && $userDutyCheck->isNotImport == true) return "<h1 style='color: darkred;text-align:center'>当前还未入场，不可出场!</h1>";
+                if ($userDutyCheck && $userDutyCheck->import == true) return "<h1 style='color: darkred;text-align:center'>您已入场，不可再次入场!</h1>";
+                if ($userDutyCheck && $userDutyCheck->export == true) return "<h1 style='color: darkred;text-align:center'>您已出场，不可再次出场!!</h1>";
+                if (!$userDutyCheck) return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
+                $laborReportService = app('LaborReportService');
+                $errorMessage = $laborReportService->makeOrChangeLaborReportByUserDutyCheck($userDutyCheck, $importAndExportQRCodeType);
+                if ($errorMessage) return $errorMessage;
+                $laravelEchoPrefix = config('database.redis.options.prefix');
+                return response()->view('personnel/checking-in/importAndExportSuccess', ['full_name' => $userDetail->full_name, 'checked_at' => $userDutyCheck->checked_at, 'type' => $userDutyCheck->type, 'laravelEchoPrefix' => $laravelEchoPrefix]);
+
+            }
         }
         return view("personnel/checking-in/importAndExportClock", compact('importAndExportQRCodeType'));
     }