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

app/Http/Controllers/Admin/GateController.php

@@ -138,7 +138,7 @@ class GateController extends CommonController
         $gateLog = GateLog::add($this->getUserId(), $all['code'], $all['person_no'] ?? [], $all['car_no'] ?? [], $remark);
         if ($all['type'] == 1) {
             // 入场
-            Visit::where('code', $all['code'])->update(['audit_status' => 3, 'person_no' => $all['person_no'] ?? '', 'car_no' => $all['car_no'] ?? '']);
+            Visit::where('code', $all['code'])->update(['audit_status' => 3]);
         }
         if ($all['type'] == 2) {
             Visit::where('code', $all['code'])->update(['audit_status' => 4]);

app/Http/Controllers/Admin/OtherController.php

@@ -32,7 +32,7 @@ class OtherController extends CommonController
     {
         $all = \request()->all();
         $show_all = request('show_all', 0);
-        $list = Admin::where(function ($query) use ($all, $show_all) {
+        $list = Admin::with('department')->where(function ($query) use ($all, $show_all) {
             if (isset($all['department_id'])) {
                 $query->where('department_id', $all['department_id']);
             }

app/Models/Visit.php

@@ -69,7 +69,7 @@ class Visit extends SoftDeletesModel
 
     public function getTypeTextAttribute()
     {
-        $array = [1 => '普通访客', 2 => '施工访客', 3 => '物流访客'];
+        $array = [1 => '普通访客', 2 => '施工访客', 3 => '物流司机'];
         return $array[$this->type] ?? '';
     }