UserDto map

src/Hotline.Application/Mappers/IdentityMapperConfigs.cs

@@ -20,6 +20,8 @@ public class IdentityMapperConfigs : IRegister
 
         config.NewConfig<User, UserDto>()
             .IgnoreIf((s, d) => s.Account == null, d => d.UserName)
+            .IgnoreIf((s,d)=> s.Account == null,d=>d.AccountLockoutEnd)
+            .IgnoreIf((s,d)=> s.Account == null,d=>d.AccountLockoutEnabled)
             .IgnoreIf((s, d) => s.Roles == null || !s.Roles.Any(), d => d.RoleNames)
             .IgnoreIf((s, d) => s.Organization == null, d => d.Organization)
             .Map(d => d.UserName, x => x.Account.UserName)

src/Hotline.Share/Dtos/Users/UserDto.cs

@@ -31,11 +31,11 @@ public record UserDto : AddUserDto
 
     public OrgDto Organization { get; set; }
 
-    //public DateTime? AccountLockoutEnd { get; set; }
+    public DateTime? AccountLockoutEnd { get; set; }
 
-    //public bool? AccountLockoutEnabled { get; set; }
+    public bool? AccountLockoutEnabled { get; set; }
 
-    //public bool? IsNormal => AccountLockoutEnabled == true && AccountLockoutEnd >= DateTime.Now ? false : true;
+    public bool? IsNormal => (AccountLockoutEnabled.HasValue && AccountLockoutEnabled == true) && (AccountLockoutEnd.HasValue && AccountLockoutEnd >= DateTime.Now) ? false : true;
 }
 
 public record AddUserDto