diff --git a/app/Http/Controllers/Admin/GateController.php b/app/Http/Controllers/Admin/GateController.php index 85f5df8..8006b8a 100644 --- a/app/Http/Controllers/Admin/GateController.php +++ b/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]); diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 37b4c43..aa86ac7 100644 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/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']); } diff --git a/app/Models/Visit.php b/app/Models/Visit.php index 9952eed..719c1a8 100644 --- a/app/Models/Visit.php +++ b/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] ?? ''; }