update. 完善用户相关增删改查接口以及Schema模型

users/schema.py

@@ -2,12 +2,18 @@
 from datetime import datetime
 from typing import List, Optional
 
-from ninja import Schema, ModelSchema
-
-from users.models import User
+from ninja import Schema
 
 
 # ========== 用户 Schema ==========
+class UserRoleOut(Schema):
+    id: int
+    name: str
+
+
+class UserDeptOut(Schema):
+    id: int
+    name: str
 
 
 class UserOut(Schema):
@@ -18,8 +24,8 @@ class UserOut(Schema):
     email: Optional[str] = None
     avatar: Optional[str] = None
 
-    # dept: Optional[int] = None
-    # roles: List[int] = []
+    dept: Optional[UserDeptOut] = None
+    roles: List[UserRoleOut] = []
 
     is_active: bool
     is_staff: bool
@@ -31,7 +37,7 @@ class UserOut(Schema):
 
 class UserCreate(Schema):
     username: str
-    password: str
+    password: Optional[str] = None
     cname: Optional[str] = None
     phone: Optional[str] = None
     email: Optional[str] = None
@@ -40,15 +46,20 @@ class UserCreate(Schema):
     is_active: bool = True
 
 
+class UserResetPassword(Schema):
+    user_id: int
+    new_password: str
+
+
 class UserUpdate(Schema):
-    username: Optional[str]
-    password: Optional[str]
-    cname: Optional[str]
-    phone: Optional[str]
-    email: Optional[str]
-    dept: Optional[int]
-    roles: Optional[List[int]]
-    is_active: Optional[bool]
+    username: Optional[str] = None
+    password: Optional[str] = None
+    cname: Optional[str] = None
+    phone: Optional[str] = None
+    email: Optional[str] = None
+    dept: Optional[int] = None
+    roles: Optional[List[int]] = None
+    is_active: Optional[bool] = None
 
 
 # ========== 菜单 Schema ==========