From 73b36906c70b9b1cc101f783ee0816b0ec0a08ba Mon Sep 17 00:00:00 2001 From: "allen.yan" Date: Fri, 27 Jun 2025 13:47:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AA=BF=E6=95=B4=E6=99=82=E9=96=93=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=20=E4=BF=AE=E6=AD=A3=2020250627?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/BranchControlController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/BranchControlController.php b/app/Http/Controllers/BranchControlController.php index 0755297..84eda71 100644 --- a/app/Http/Controllers/BranchControlController.php +++ b/app/Http/Controllers/BranchControlController.php @@ -80,8 +80,8 @@ class BranchControlController extends Controller $roomName => [ 'is_online' => $room->is_online, 'status' => $room->status?->value ?? null, - 'started_at' => optional($room->started_at)->timezone('Asia/Taipei')->format('Y-m-d H:i:s'), - 'ended_at' => optional($room->ended_at)->timezone('Asia/Taipei')->format('Y-m-d H:i:s'), + 'started_at' => $room->started_at ? $room->started_at->timezone('Asia/Taipei')->format('Y-m-d H:i:s') : null, + 'ended_at' => $room->ended_at ? $room->ended_at->timezone('Asia/Taipei')->format('Y-m-d H:i:s') : null ] ]; }),