diff --git a/src/pages/Add/Add.tsx b/src/pages/Add/Add.tsx index 169755b..ac40511 100644 --- a/src/pages/Add/Add.tsx +++ b/src/pages/Add/Add.tsx @@ -71,7 +71,10 @@ export default function Add() { enqueueSnackbar(tmpData.error, { variant: 'error' }) } } else if (tmpData.data != null) { - if (tmpData.data?.group?.expired_status !== 0) { + if ( + tmpData.data.user?.group_id !== 0 && + tmpData.data?.group?.expired_status !== 0 + ) { navigate('/dashboard') } setData(tmpData.data) diff --git a/src/pages/Dashboard/Dashboard.tsx b/src/pages/Dashboard/Dashboard.tsx index 77c1886..5658dc0 100644 --- a/src/pages/Dashboard/Dashboard.tsx +++ b/src/pages/Dashboard/Dashboard.tsx @@ -114,7 +114,7 @@ export default function Dashboard() { - {data?.group?.expired_status !== 0 && ( + {data?.user?.group_id !== 0 && data?.group?.expired_status !== 0 && ( @@ -164,28 +164,29 @@ export default function Dashboard() { )} - {data?.group?.expired_status === 0 && status !== 3 && ( - - - - 申請手続きのお知らせ - - -
- 以下の「申請ページはこちら」ボタンより手続きを進めてください -
- - - -
- )} + {!(data?.user?.group_id !== 0 && data?.group?.expired_status === 0) && + status !== 3 && ( + + + + 申請手続きのお知らせ + + +
+ 以下の「申請ページはこちら」ボタンより手続きを進めてください +
+ + + +
+ )} {data?.group?.expired_status === 0 && data?.notice?.map((notice, index) => (