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];