From 2f537ab83ec39abcdb50bcd25b831a6956268da5 Mon Sep 17 00:00:00 2001 From: jiohjung98 Date: Mon, 10 Jun 2024 15:50:43 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=95=B1=20=EC=B2=98=EC=9D=8C=20?= =?UTF-8?q?=EC=A7=84=EC=9E=85=20=EC=8B=9C,=20=EC=A7=80=EC=A0=90=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=95=88=ED=95=98=EA=B3=A0=20=EC=98=88?= =?UTF-8?q?=EC=95=BD=20=ED=83=AD=EC=97=90=EC=84=9C=20=EC=B2=98=EC=9D=8C=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=EB=90=9C=20=EA=B0=95=EB=82=A81=ED=98=B8?= =?UTF-8?q?=EC=A0=90=20=EB=AF=B8=ED=8C=85=EB=A3=B8=20=EC=98=88=EC=95=BD=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=A7=84=EC=9E=85=20=ED=9B=84=20?= =?UTF-8?q?=EC=A7=80=EC=A0=90=20=EC=83=81=EC=84=B8=EB=B3=B4=EA=B8=B0=20?= =?UTF-8?q?=EC=8B=9C=20=EC=A7=80=EC=A0=90=EC=83=81=EC=84=B8=EB=B3=B4?= =?UTF-8?q?=EA=B8=B0=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EB=8F=99?= =?UTF-8?q?=EC=95=88=ED=95=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/reservation/meetingRoom/MeetingRoomInfo.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx b/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx index 0732332..8027c70 100644 --- a/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx +++ b/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx @@ -56,9 +56,9 @@ const MeetingRoomInfo = () => { const updatedTimeReserved = useBranchStore2((state) => state.updatedTimeReserved); const currentBranch = - updatedTimeSelected && updatedTimeReserved && updatedTimeSelected > updatedTimeReserved - ? selectedBranch - : reservedBranch; + updatedTimeSelected && updatedTimeReserved && updatedTimeSelected > updatedTimeReserved + ? selectedBranch + : reservedBranch || selectedBranch; console.log(`current Branch = ${currentBranch?.branchName}`); @@ -132,7 +132,6 @@ const MeetingRoomInfo = () => { const officeInfo = data.data; console.log(officeInfo); router.push({ - // pathname: `/branches/${encodeURIComponent(officeInfo!.branchName)}`, pathname: `/branches/${encodeURIComponent(currentBranch!.branchName)}`, query: { name: officeInfo.branchName,