diff --git a/src/app/(route)/admin/(with-layout)/members/page.tsx b/src/app/(route)/admin/(with-layout)/members/page.tsx index 7a4c8c22..63c41be9 100644 --- a/src/app/(route)/admin/(with-layout)/members/page.tsx +++ b/src/app/(route)/admin/(with-layout)/members/page.tsx @@ -131,7 +131,9 @@ const AdminMembersListPage = () => { ) : ( data.memberInfos.map((item, index) => ( - {index + 1} + + {(currentPage - 1) * 10 + index + 1} + {item.name} {item.accountId} {item.department} diff --git a/src/app/(route)/admin/(with-layout)/notices/page.tsx b/src/app/(route)/admin/(with-layout)/notices/page.tsx index 3b460dcf..42ac5808 100644 --- a/src/app/(route)/admin/(with-layout)/notices/page.tsx +++ b/src/app/(route)/admin/(with-layout)/notices/page.tsx @@ -142,7 +142,9 @@ const NoticesListPage = () => { ) : ( data.announcementInfos.map((item, index) => ( - {index + 1} + + {(currentPage - 1) * 10 + index + 1} + {noticeTypeConverter[item.announcementType]} diff --git a/src/app/(route)/admin/(with-layout)/points/policy/page.tsx b/src/app/(route)/admin/(with-layout)/points/policy/page.tsx index 4fd54dcb..5554e926 100644 --- a/src/app/(route)/admin/(with-layout)/points/policy/page.tsx +++ b/src/app/(route)/admin/(with-layout)/points/policy/page.tsx @@ -94,7 +94,9 @@ const AdminPointsPolicyPage = () => { ) : ( data.pointPolicyList.map((item, idx) => ( - {idx + 1} + + {(page - 1) * 10 + idx + 1} +
{item.policyTitle} diff --git a/src/app/(route)/admin/(with-layout)/points/reward/new/page.tsx b/src/app/(route)/admin/(with-layout)/points/reward/new/page.tsx index 4168128c..a5c41f6f 100644 --- a/src/app/(route)/admin/(with-layout)/points/reward/new/page.tsx +++ b/src/app/(route)/admin/(with-layout)/points/reward/new/page.tsx @@ -20,7 +20,7 @@ import { usePostPointSupplyMutation } from '@/_hooks/admin/usePostPointSupplyMut import { MemberType } from '@/_types/adminType'; import Image from 'next/image'; import { useRouter } from 'next/navigation'; -import { useRef, useState } from 'react'; +import { useState } from 'react'; import AdminLoading from '@/_components/admin/adminLoading'; import { departmentList } from '@/_types/commonType'; @@ -191,7 +191,12 @@ const AdminPointsRewardNewPage = () => { + request.accountId === member.accountId, + ) + } onClickBoolean={() => [ setSelectedRequest((prev) => prev.includes(member) diff --git a/src/app/(route)/admin/(with-layout)/points/reward/page.tsx b/src/app/(route)/admin/(with-layout)/points/reward/page.tsx index f768adba..8406397f 100644 --- a/src/app/(route)/admin/(with-layout)/points/reward/page.tsx +++ b/src/app/(route)/admin/(with-layout)/points/reward/page.tsx @@ -135,7 +135,9 @@ const AdminPointsRewardPage = () => { ) : ( data.pointSupplyList.map((item, index) => ( - {index + 1} + + {(currentPage - 1) * 10 + index + 1} + { ) : ( data.wktInfos.map((item, index) => ( - {index + 1} + + {(currentPage - 1) * 10 + index + 1} + {item.title} {dayjs(item.createdAt).format('YYYY.MM.DD')} diff --git a/src/app/(route)/admin/(with-layout)/workation/reviews/page.tsx b/src/app/(route)/admin/(with-layout)/workation/reviews/page.tsx index 35f36fc1..f417362c 100644 --- a/src/app/(route)/admin/(with-layout)/workation/reviews/page.tsx +++ b/src/app/(route)/admin/(with-layout)/workation/reviews/page.tsx @@ -130,7 +130,9 @@ const AdminWorkationReviewsPage = () => { ) : ( data.reviewList.map((item, order) => ( - {order + 1} + + {(currentPage - 1) * 10 + order + 1} +
{[...Array(item.rating)].map((_, index) => ( diff --git a/src/app/_components/admin/points/modules/PointPolicyInfoModule.tsx b/src/app/_components/admin/points/modules/PointPolicyInfoModule.tsx index be91a0b8..d727dff7 100644 --- a/src/app/_components/admin/points/modules/PointPolicyInfoModule.tsx +++ b/src/app/_components/admin/points/modules/PointPolicyInfoModule.tsx @@ -15,12 +15,8 @@ const PointPolicyInfoModule = () => { 적용됩니다.
  • - 새로운 정책에 대해 모든 회원에게 메일을 통해 안내 되며, 회원은 이러한 - 정책에 알맞은 포인트 신청을 진행할 수 있습니다. -
  • -
  • - 기존 정책 수정 시에도 회원들에게 메일을 통해 안내됩니다. 잦은 수정은 - 지양해주시길 바랍니다. + 회원은 이러한 정책에 알맞은 포인트 신청을 진행할 수 있습니다. 잦은 + 수정은 지양해주시길 바랍니다.
  • {`단발성 이벤트로 인한 포인트 지급은 정책 등록이 아닌 공지 > 이벤트 등록과 단체 포인트 지급하기 기능을 이용해주세요.`}
  • diff --git a/src/app/_hooks/admin/useGetMemberListInfiniteQuery.ts b/src/app/_hooks/admin/useGetMemberListInfiniteQuery.ts index bfc66e47..82a2903f 100644 --- a/src/app/_hooks/admin/useGetMemberListInfiniteQuery.ts +++ b/src/app/_hooks/admin/useGetMemberListInfiniteQuery.ts @@ -23,7 +23,14 @@ export const useGetMemberListInifiniteQuery = ({ queryFn: async ({ pageParam = pageable }) => { const { page, size, sort } = pageParam; // Destructure page, size, and sort from pageParam const res = await api.get('/api/member', { - params: { name: searchText, department, page, size, sort }, // Ensure the sort parameter is passed here + params: { + name: searchText, + department, + isPenalty: true, + page, + size, + sort, + }, // Ensure the sort parameter is passed here }); return memberListSchema.parse(res.data.data); },