diff --git a/apps/admin/src/pages/Classes/detail.tsx b/apps/admin/src/pages/Classes/detail.tsx index 37f1389..848d44f 100644 --- a/apps/admin/src/pages/Classes/detail.tsx +++ b/apps/admin/src/pages/Classes/detail.tsx @@ -42,6 +42,7 @@ interface ClassStudent { interface ClassTeacher { id: number; userId: number; + name: string | null; username: string; roleType: string; subject: string | null; @@ -360,7 +361,7 @@ const ClassDetailPage: React.FC = () => { ]; const teacherColumns: ColumnsType = [ - { title: '姓名', dataIndex: 'username' }, + { title: '姓名', dataIndex: 'name', render: (name: string | null) => name || '-' }, { title: '角色', dataIndex: 'roleType', @@ -509,7 +510,7 @@ const ClassDetailPage: React.FC = () => { {detail.studentCount}/{detail.maxStudents || '-'} - {teachers.find((t) => t.roleType === 'head_teacher')?.username || '-'} + {teachers.find((t) => t.roleType === 'head_teacher')?.name || '-'} {detail.notes || '-'} diff --git a/apps/server/src/classes/classes.service.ts b/apps/server/src/classes/classes.service.ts index 1829d61..8c3f931 100644 --- a/apps/server/src/classes/classes.service.ts +++ b/apps/server/src/classes/classes.service.ts @@ -172,6 +172,7 @@ export class ClassesService { teachers: teachers.map((t) => ({ id: t.id, userId: t.userId, + name: t.user?.name, username: t.user?.username, roleType: t.roleType, subject: t.subject,