Merge branch 'master' of ssh://47.101.48.251:/data/git/visitor

app/Http/Controllers/Mobile/VisitController.php

@@ -90,15 +90,15 @@ class VisitController extends CommonController
             $model->fill($all);
             $model->save();
             // 创建时候审核流程写入
+            // 被访问做第一级审核
+            VisitAudit::create([
+                'visit_id' => $model->id,
+                'audit_admin_id' => $all['accompany_id'],
+                'status' => 0,
+                'level' => 0
+            ]);
             $area = VisitArea::find($all['visit_area_id']);
             if ($area->audit_admin && !isset($all['id'])) {
-                // 被访问做第一级审核
-                VisitAudit::create([
-                    'visit_id' => $model->id,
-                    'audit_admin_id' => $all['accompany_id'],
-                    'status' => 0,
-                    'level' => 0
-                ]);
                 // 其他按设置审核
                 $audit_admin = collect($area->audit_admin)->sortBy('level');
                 foreach ($audit_admin as $key => $item) {

app/Http/Middleware/SanctumJWT.php

@@ -26,6 +26,9 @@ class SanctumJWT
             return $this->fail(StarterResponseCode::JWT_AUTH_FAIL);
         }
         $tokenable = $token->tokenable;
+        if(!isset($tokenable->id)){
+            return $this->fail(StarterResponseCode::JWT_AUTH_FAIL);
+        }
 
         $guards = config("auth.guards");
         foreach ($guards as $k => $v) {