一次大的提交

lib/features/auth/data/models/user_model.dart

@@ -12,19 +12,22 @@ class UserModel extends UserEntity implements BaseModel {
     super.avatar,
     super.email,
     super.phone,
+    super.roleKey,
+    super.siteId,
   });
 
   factory UserModel.fromJson(Map<String, dynamic> json) {
-    print(json);
     return UserModel(
-      userId: json['userId'],
-      username: json['username'],
-      nickname: json['nickName'],
-      token: json['token'],
-      orgId: json['orgId'] ?? 0, // 从登录响应中获取 orgId
+      userId: json['userId']?.toString() ?? '',
+      username: json['username'] ?? '',
+      nickname: json['nickName'] ?? '',
+      token: json['token'] ?? '',
+      orgId: (json['orgId'] as num?)?.toInt() ?? 0,
       avatar: json['avatar'],
       email: json['email'],
       phone: json['phone'],
+      roleKey: json['roleKey'],
+      siteId: (json['siteId'] as num?)?.toInt(),
     );
   }
 
@@ -38,6 +41,8 @@ class UserModel extends UserEntity implements BaseModel {
       'avatar': avatar,
       'email': email,
       'phone': phone,
+      'roleKey': roleKey,
+      'siteId': siteId,
     };
   }
 
@@ -51,6 +56,8 @@ class UserModel extends UserEntity implements BaseModel {
       avatar: avatar,
       email: email,
       phone: phone,
+      roleKey: roleKey,
+      siteId: siteId,
     );
   }
 
@@ -64,6 +71,8 @@ class UserModel extends UserEntity implements BaseModel {
       avatar: entity.avatar,
       email: entity.email,
       phone: entity.phone,
+      roleKey: entity.roleKey,
+      siteId: entity.siteId,
     );
   }
-}
+}