完善人事管理系统

app/Http/Controllers/UserDutyCheckController.php

@@ -48,11 +48,10 @@ class UserDutyCheckController extends Controller
                 $user=UserToken::getUser($userLaborToken);
                 $user->userWorkgroups()->sync([$userWorkgroupID]);
             }
-            $dateNow=Carbon::now()->format('Y-m-d');
-            $laborReport=LaborReport::where('user_workgroup_id',$userWorkgroupID)->where('created_at','like',$dateNow."%")->where('user_id',$userDetail->user_id)->first();
             $userDutyCheck=$this->dutyCheck($userDetail->user_id,$userWorkgroupID);
             //正常情况
-            if(!$laborReport&&$userDutyCheck->type=='登入'){
+            $laborReport=LaborReport::where('user_workgroup_id',$userWorkgroupID)->where('created_at','like',Carbon::now()->format('Y-m-d')."%")->where('user_id',$userDetail->user_id)->first();
+            if(!isset($laborReport)&&$userDutyCheck->type=='登入'){
                 $this->createLaborReportData($userDetail,$userWorkgroupID,$userDutyCheck);
             }else if ($laborReport&&$userDutyCheck->type=='登出'){
                 $this->updateLaborReportData($laborReport,$userDutyCheck);
@@ -89,9 +88,9 @@ class UserDutyCheckController extends Controller
         if ($diffDate>7*1440){
             return redirect('personnel/checking-in/userDutyCheck/updateUserDetail/'.$mobile_phone)->with("userWorkgroupID",$userWorkgroupID);
         }
-        $laborReport=LaborReport::where('user_workgroup_id',$userWorkgroupID)->where('created_at','like',$dateNow."%")->where('user_id',$userDetail->user_id)->first();
         $userDutyCheck=$this->dutyCheck($userDetail->user_id,$userWorkgroupID);
         //正常情况
+        $laborReport=LaborReport::where('user_workgroup_id',$userWorkgroupID)->where('created_at','like',$dateNow."%")->where('user_id',$userDetail->user_id)->first();
         if(!$laborReport&&$userDutyCheck->type=='登入'){
              $this->createLaborReportData($userDetail,$userWorkgroupID,$userDutyCheck);
         }else if ($laborReport&&$userDutyCheck->type=='登出'){
@@ -248,6 +247,7 @@ class UserDutyCheckController extends Controller
     }
     //添加临时工报表数据
     public function createLaborReportData($userDetail,$userWorkgroupID,$userDutyCheck){
+        dd('ok');
         $user_id=$userDetail['user_id'];
         $name=$userDetail['full_name'];
         $mobile_phone=$userDetail['mobile_phone'];