From 07461ca043ddcf43e870dad0aa4b90702201b4d9 Mon Sep 17 00:00:00 2001 From: JANGHYUNn Date: Wed, 24 Jul 2024 14:25:55 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=84=EC=A0=95=EB=B3=84=20=EB=8F=99?= =?UTF-8?q?=EC=A0=81=20=EB=9D=BC=EC=9A=B0=ED=8C=85=20=EC=9D=B4=EC=8A=88?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20login=ED=9B=84=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=EC=9D=B4=EB=8F=99=20=EC=BD=94=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/account/login/AccountLogin.js | 6 +++--- src/router/hoc/ResolveRoutes.tsx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/account/login/AccountLogin.js b/src/components/account/login/AccountLogin.js index de36af7c..dcdcd178 100644 --- a/src/components/account/login/AccountLogin.js +++ b/src/components/account/login/AccountLogin.js @@ -78,11 +78,11 @@ export const AccountLogin = ({ history }) => { } } = res; if (cptAuthCode === 'DF0002') { - history.push('/control/approvals'); + location.href = '/control/approvals'; } else if (cptAuthCode === 'DF0002-1') { - history.push('/operation/approvals'); + location.href = '/operation/approvals'; } else { - history.push('/control'); + location.href = '/control'; } } }; diff --git a/src/router/hoc/ResolveRoutes.tsx b/src/router/hoc/ResolveRoutes.tsx index 88f7886d..a31af69c 100644 --- a/src/router/hoc/ResolveRoutes.tsx +++ b/src/router/hoc/ResolveRoutes.tsx @@ -32,10 +32,10 @@ export default function ResolveRoutes() { const cptAuthCode = localStorage.getItem('cptAuthCode'); - let Router = Routes; + let Router = [...Routes]; let decodeToken = getDecodeToken(); - console.log(decodeToken); + console.log(decodeToken, '??????'); if (decodeToken) { if (decodeToken.userId === 'palnet') { Router = [...Routes, ...GimpoControlRoutes];