From 50b3608db4e123e1f48f575f61e7b595adc31000 Mon Sep 17 00:00:00 2001
From: wangziqi <wangziqi@gongxue100.com>
Date: Fri, 10 Jul 2026 14:12:08 +0800
Subject: [PATCH] fix(admin): repair class, role, and room views

Use the RBAC user endpoint for teacher selection, restore role table columns, correct Ant Design props, and add typed room bed and locker responses.
---
 apps/admin/src/pages/Classes/detail.tsx |  4 ++--
 apps/admin/src/pages/Classes/index.tsx  |  5 -----
 apps/admin/src/pages/Roles/index.tsx    |  1 +
 apps/admin/src/pages/Rooms/index.tsx    | 18 ++++++++++++++++--
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/apps/admin/src/pages/Classes/detail.tsx b/apps/admin/src/pages/Classes/detail.tsx
index 2a0b298..e4bf096 100644
--- a/apps/admin/src/pages/Classes/detail.tsx
+++ b/apps/admin/src/pages/Classes/detail.tsx
@@ -286,7 +286,7 @@ const ClassDetailPage: React.FC = () => {
 
   const openTeacherModal = async () => {
     try {
-      const res = await api.get('/users') as UserItem[];
+      const res = await api.get('/rbac/users') as UserItem[];
       setAllUsers(res || []);
       setTeacherUserId(undefined);
       setTeacherRole('subject_teacher');
@@ -576,7 +576,7 @@ const ClassDetailPage: React.FC = () => {
                   onOk={handleAddTeacher}
                   onCancel={() => setTeacherModalOpen(false)}
                 >
-                  <Space orientation="vertical" style={{ width: '100%' }}>
+                  <Space direction="vertical" style={{ width: '100%' }}>
                     <Select
                       style={{ width: '100%' }}
                       placeholder="选择教师"
diff --git a/apps/admin/src/pages/Classes/index.tsx b/apps/admin/src/pages/Classes/index.tsx
index b269d9c..9b3b0d2 100644
--- a/apps/admin/src/pages/Classes/index.tsx
+++ b/apps/admin/src/pages/Classes/index.tsx
@@ -42,11 +42,6 @@ interface ClassFormValues {
   notes?: string;
 }
 
-interface ClassQueryParams {
-  status?: string;
-  classType?: string;
-}
-
 // ---- Constants ----
 
 const STATUS_MAP: Record<string, { color: string; text: string }> = {
diff --git a/apps/admin/src/pages/Roles/index.tsx b/apps/admin/src/pages/Roles/index.tsx
index 596ff24..97d137e 100644
--- a/apps/admin/src/pages/Roles/index.tsx
+++ b/apps/admin/src/pages/Roles/index.tsx
@@ -226,6 +226,7 @@ const RolesPage: React.FC = () => {
         </PermissionButton>
       </div>
       <Table
+        columns={columns}
         dataSource={data}
         rowKey="id"
         loading={loading}
diff --git a/apps/admin/src/pages/Rooms/index.tsx b/apps/admin/src/pages/Rooms/index.tsx
index 1896f97..8176287 100644
--- a/apps/admin/src/pages/Rooms/index.tsx
+++ b/apps/admin/src/pages/Rooms/index.tsx
@@ -39,6 +39,20 @@ const statusMap: Record<string, { text: string; color: string }> = {
   archived: { text: '已归档', color: '#999' },
 };
 
+interface BedItem {
+  id: number;
+  bedNumber: string;
+  status: string;
+  notes?: string | null;
+}
+
+interface LockerItem {
+  id: number;
+  lockerNumber: string;
+  status: string;
+  notes?: string | null;
+}
+
 function parseRoomNumber(input: string) {
   const cleaned = input.replace(/[（(].*?[）)]/g, '').trim();
   const familyMatch = cleaned.match(/^(\d+)-(\d+)-(\d+)$/);
@@ -166,7 +180,7 @@ const RoomsPage: React.FC = () => {
   };
   const fetchBeds = useCallback(async (roomId: number) => {
     try {
-      const res = await api.get(`/rooms/${roomId}/beds`);
+      const res = await api.get<BedItem[]>(`/rooms/${roomId}/beds`);
       setBeds(res);
     } catch (e: unknown) {
       const err = e as { message?: string };
@@ -176,7 +190,7 @@ const RoomsPage: React.FC = () => {
 
   const fetchLockers = useCallback(async (roomId: number) => {
     try {
-      const res = await api.get(`/rooms/${roomId}/lockers`);
+      const res = await api.get<LockerItem[]>(`/rooms/${roomId}/lockers`);
       setLockers(res);
     } catch (e: unknown) {
       const err = e as { message?: string };