diff --git a/src/app/(pages)/(main)/admin/settings/page.tsx b/src/app/(pages)/(main)/admin/settings/page.tsx index 14dcd6d..b99dd5e 100644 --- a/src/app/(pages)/(main)/admin/settings/page.tsx +++ b/src/app/(pages)/(main)/admin/settings/page.tsx @@ -59,7 +59,7 @@ export default function AdminSettingsPage() { { id: "target", header: "팝업 대상", size: 120, cell: ({ row }) => }, { accessorKey: "startDt", header: "팝업 시작", size: 110, cell: ({ row }) => row.original.startDt?.slice(0, 10) }, { accessorKey: "endDt", header: "팝업 종료", size: 110, cell: ({ row }) => row.original.endDt?.slice(0, 10) }, - { accessorKey: "regUser", header: "게시자", size: 100 }, + { accessorKey: "regUser", header: "게시자", size: 100, cell: ({ row }) => row.original.regUserName ?? row.original.regUser }, { accessorKey: "regDt", header: "게시일", size: 110, cell: ({ row }) => row.original.regDt?.slice(0, 10) }, ], [totalElements, pagination.pageIndex, pagination.pageSize, centersQuery.data]); diff --git a/src/app/(pages)/(main)/notices/NoticeViewDialog.tsx b/src/app/(pages)/(main)/notices/NoticeViewDialog.tsx index ede7230..1434f5c 100644 --- a/src/app/(pages)/(main)/notices/NoticeViewDialog.tsx +++ b/src/app/(pages)/(main)/notices/NoticeViewDialog.tsx @@ -65,7 +65,7 @@ export function NoticeViewDialog({ noticeId, onEdit, onDeleted }: NoticeViewDial ) : (
- {notice.regUser} · {notice.regDt?.slice(0, 10)} + {notice.regUserName ?? notice.regUser} · {notice.regDt?.slice(0, 10)} {admin ? ( <> · 공지 대상: diff --git a/src/app/(pages)/(main)/notices/page.tsx b/src/app/(pages)/(main)/notices/page.tsx index 94aa73c..172e9fc 100644 --- a/src/app/(pages)/(main)/notices/page.tsx +++ b/src/app/(pages)/(main)/notices/page.tsx @@ -78,7 +78,7 @@ export default function NoticesPage() { } base.push( - { accessorKey: "regUser", header: "게시자", size: 100 }, + { accessorKey: "regUser", header: "게시자", size: 100, cell: ({ row }) => row.original.regUserName ?? row.original.regUser }, { accessorKey: "regDt", header: "게시일", size: 110, cell: ({ row }) => row.original.regDt?.slice(0, 10) }, ); diff --git a/src/app/(pages)/(main)/qna/QnaAnswerSection.tsx b/src/app/(pages)/(main)/qna/QnaAnswerSection.tsx index f324467..8c4b67a 100644 --- a/src/app/(pages)/(main)/qna/QnaAnswerSection.tsx +++ b/src/app/(pages)/(main)/qna/QnaAnswerSection.tsx @@ -98,7 +98,7 @@ export function QnaAnswerSection({ questionId, answer, admin, onChanged }: QnaAn return (
- 답변자: {answer?.regUser} · {answer?.regDt?.slice(0, 10)} + 답변자: {answer?.regUserName ?? answer?.regUser} · {answer?.regDt?.slice(0, 10)}
- {question.regUser} · {question.regDt?.slice(0, 10)} - {admin ? ` · ${question.centerName}` : ""} + {question.regUser} · {question.regDt?.slice(0, 10)} · {question.centerName}
totalElements - pagination.pageIndex * pagination.pageSize - row.index, }, { accessorKey: "title", header: "문의 제목" }, - { accessorKey: "regUser", header: "게시자", size: 100 }, + { accessorKey: "regUser", header: "게시자", size: 100, cell: ({ row }) => row.original.regUser }, { accessorKey: "regDt", header: "게시일", size: 110, cell: ({ row }) => row.original.regDt?.slice(0, 10) }, ]; diff --git a/src/types/notice.ts b/src/types/notice.ts index 3b3f5ca..b7e3e19 100644 --- a/src/types/notice.ts +++ b/src/types/notice.ts @@ -15,6 +15,7 @@ export interface Notice { files: FileItem[]; viewed: boolean; regUser: string; + regUserName?: string | null; regDt: string; modUser: string; modDt: string; diff --git a/src/types/popup.ts b/src/types/popup.ts index 552df31..675448b 100644 --- a/src/types/popup.ts +++ b/src/types/popup.ts @@ -15,6 +15,7 @@ export interface Popup { endDt: string; viewed: boolean; regUser: string; + regUserName?: string | null; regDt: string; modUser: string; modDt: string; diff --git a/src/types/qna.ts b/src/types/qna.ts index 8c859a7..9aacb15 100644 --- a/src/types/qna.ts +++ b/src/types/qna.ts @@ -13,6 +13,7 @@ export interface QnaAnswer { viewUser?: string | null; viewDt?: string | null; regUser: string; + regUserName?: string | null; regDt: string; modUser: string; modDt: string; @@ -33,6 +34,7 @@ export interface QnaQuestion { files: FileItem[]; answer: QnaAnswer | null; regUser: string; + regUserName?: string | null; regDt: string; modUser: string; modDt: string;