From c1bb05502e9a2b9a69e5894800812f64c4e3cac1 Mon Sep 17 00:00:00 2001
From: xiong <xiongyuxing@gongxue100.com>
Date: Fri, 24 Jul 2026 17:19:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8F=AD=E7=BA=A7=E6=95=99?=
 =?UTF-8?q?=E5=B8=88=E5=A7=93=E5=90=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/admin/src/pages/Classes/detail.tsx    | 5 +++--
 apps/server/src/classes/classes.service.ts | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

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<ClassTeacher> = [
-    { 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 || '-'}
                       </Descriptions.Item>
                       <Descriptions.Item label="班主任">
-                        {teachers.find((t) => t.roleType === 'head_teacher')?.username || '-'}
+                        {teachers.find((t) => t.roleType === 'head_teacher')?.name || '-'}
                       </Descriptions.Item>
                       <Descriptions.Item label="备注">{detail.notes || '-'}</Descriptions.Item>
                     </Descriptions>
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,