v2.9update

backend/models/admin_role.py

@@ -30,9 +30,9 @@ class AdminRoleModel:
     @staticmethod
     async def get_all() -> List[Dict[str, Any]]:
         sql = """
-            SELECT ar.*, u.real_name, u.username, s.subject_name
+            SELECT ar.*, u.real_name, u.username, u.status, s.subject_name
             FROM admin_roles ar
-            JOIN users u ON ar.user_id = u.user_id AND u.status = 1
+            JOIN users u ON ar.user_id = u.user_id
             LEFT JOIN subjects s ON ar.subject_id = s.subject_id
             ORDER BY ar.role_type
         """

backend/models/conduct.py

@@ -289,6 +289,7 @@ class ConductModel:
                 cr.points_change,
                 cr.reason,
                 cr.recorder_name,
+                MAX(cr.related_type) as related_type,
                 DATE_FORMAT(MIN(cr.created_at), '%%Y-%%m-%%d %%H:%%i:%%s') as created_at,
                 GROUP_CONCAT(s.name ORDER BY s.student_id SEPARATOR ', ') as student_names,
                 COUNT(*) as student_count,

backend/models/user.py

@@ -93,6 +93,17 @@ class UserModel:
         """
         await execute_update(sql, (ip, user_id))
     
+    @staticmethod
+    async def get_by_username_any(username: str) -> dict:
+        """根据用户名获取用户（含已禁用）"""
+        sql = """
+            SELECT user_id, username, password_hash, real_name, user_type,
+                   student_id, status, need_change_password, last_login_time, last_login_ip
+            FROM users
+            WHERE username = %s
+        """
+        return await execute_one(sql, (username,))
+    
     @staticmethod
     async def check_username_exists(username: str) -> bool:
         """检查用户名是否存在"""