diff --git a/src/component/YearPagination/index.tsx b/src/component/YearPagination/index.tsx index 56ffb04..b765b4e 100644 --- a/src/component/YearPagination/index.tsx +++ b/src/component/YearPagination/index.tsx @@ -6,11 +6,12 @@ import { useQueryParam } from 'util/hooks/useQueryParam'; import * as S from './style'; interface YearPaginationProps { + pageName: string; duesYear: number; setDuesYear: React.Dispatch>; } -export default function YearPagination({ duesYear, setDuesYear }: YearPaginationProps) { +export default function YearPagination({ pageName, duesYear, setDuesYear }: YearPaginationProps) { const navigate = useNavigate(); const currentYear = new Date().getFullYear(); const param = useQueryParam('page'); @@ -20,14 +21,14 @@ export default function YearPagination({ duesYear, setDuesYear }: YearPagination // 재학생 회비 내역이 2021년부터 시작하므로 2021년 이전으로 이동할 수 없음 const prevYear = page ? page + 1 : 2; if (prevYear <= currentYear - 2020) { - navigate(`/dues?page=${prevYear}`); + navigate(`/${pageName}?page=${prevYear}`); setDuesYear((prev) => prev - 1); } }; const goToNextYear = () => { if (page && page > 1) { - navigate(`/dues?page=${page - 1}`); + navigate(`/${pageName}?page=${page - 1}`); setDuesYear((prev) => prev + 1); } }; diff --git a/src/page/DuesManagement/index.tsx b/src/page/DuesManagement/index.tsx index d33426a..73d9f91 100644 --- a/src/page/DuesManagement/index.tsx +++ b/src/page/DuesManagement/index.tsx @@ -154,7 +154,7 @@ function DefaultTable() { <>
- +
- +
{(myInfo.authority === 'ADMIN' || myInfo.authority === 'MANAGER') && ( diff --git a/src/page/PersonalDues/index.tsx b/src/page/PersonalDues/index.tsx index 1c45b4a..c8bed68 100644 --- a/src/page/PersonalDues/index.tsx +++ b/src/page/PersonalDues/index.tsx @@ -27,7 +27,7 @@ export default function PersonalDues() { return (
- +