diff --git a/src/app/(main)/profile/[empId]/page.tsx b/src/app/(main)/profile/[empId]/page.tsx index 41cb584..e10e023 100644 --- a/src/app/(main)/profile/[empId]/page.tsx +++ b/src/app/(main)/profile/[empId]/page.tsx @@ -77,24 +77,35 @@ export default function DynamicEmployeeProfilePage() { setError(null); const [empRes, historyRes, contactRes] = await Promise.allSettled([ - employeeService.getById(empId), + employeeService.getOne(empId), employeeService.getDispatchHistories(empId), apiClient.get(`/employees/${empId}/emergency-contacts`), ]); - if (empRes.status === 'fulfilled' && empRes.value?.success) { - setEmployee(empRes.value.data); + if (empRes.status === 'fulfilled' && empRes.value) { + const val = empRes.value as any; + const empData = val.data ?? val; + if (empData && empData.empId) { + setEmployee(empData); + } else { + setError('직원 정보를 찾을 수 없습니다.'); + return; + } } else { setError('직원 정보를 찾을 수 없습니다.'); return; } - if (historyRes.status === 'fulfilled' && historyRes.value?.success) { - setDispatchHistories(Array.isArray(historyRes.value.data) ? historyRes.value.data : []); + if (historyRes.status === 'fulfilled' && historyRes.value) { + const val = historyRes.value as any; + const list = val.data ?? val; + setDispatchHistories(Array.isArray(list) ? list : []); } - if (contactRes.status === 'fulfilled' && contactRes.value?.data) { - setEmergencyContacts(contactRes.value.data); + if (contactRes.status === 'fulfilled' && contactRes.value) { + const val = contactRes.value as any; + const list = val.data ?? val; + setEmergencyContacts(Array.isArray(list) ? list : []); } } catch (err) { console.error(err); @@ -478,7 +489,7 @@ export default function DynamicEmployeeProfilePage() { >

- {dh.projectName || '프로젝트'} + {(dh as any).projectName || (dh as any).project?.projectName || '프로젝트'}

{dh.roleTitle && (

{dh.roleTitle}

diff --git a/src/services/employeeService.ts b/src/services/employeeService.ts index ba23fb6..0e9ce84 100644 --- a/src/services/employeeService.ts +++ b/src/services/employeeService.ts @@ -18,6 +18,10 @@ const employeeService = { return apiClient.get>(`/employees/${empId}`); }, + getById(empId: number) { + return apiClient.get>(`/employees/${empId}`); + }, + getMe() { return apiClient.get>('/employees/me'); },