Selaa lähdekoodia

修改用户查询返回

tangjiang 1 viikko sitten
vanhempi
commit
116645db93

+ 1 - 1
src/Hotline.Api/Controllers/UserController.cs

@@ -161,7 +161,7 @@ public class UserController : BaseController
     public async Task<PagedDto<UserDto>> QueryPaged([FromQuery] UserPagedDto dto)
     {
         var query =  _userApplication.QueryPaged(dto);
-        Console.WriteLine(query.ToSqlString());
+        //Console.WriteLine(query.ToSqlString());
         var (total, items) = await query.ToPagedListAsync(dto, HttpContext.RequestAborted);
 
         //var (total, items) = await _userRepository.Queryable(includeDeleted: true)

+ 9 - 2
src/Hotline.Share/Dtos/Users/UserDto.cs

@@ -3,6 +3,7 @@ using Hotline.Share.Dtos.Roles;
 using Hotline.Share.Enums.Identity;
 using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.User;
+using System.Security.Principal;
 using XF.Utility.EnumExtensions;
 
 namespace Hotline.Share.Dtos.Users;
@@ -29,6 +30,12 @@ public record UserDto : AddUserDto
     public IReadOnlyList<RoleDto> Roles { get; set; }
 
     public OrgDto Organization { get; set; }
+
+    public DateTime? AccountLockoutEnd { get; set; }
+
+    public bool AccountLockoutEnabled { get; set; }
+
+    public bool IsNormal => AccountLockoutEnabled && AccountLockoutEnd >= DateTime.Now ? false : true;
 }
 
 public record AddUserDto
@@ -125,7 +132,7 @@ public record UpdateUserDto
     /// 部门Id
     /// </summary>
     public string? OrgId { get; set; }
-    
+
     /// <summary>
     /// 部门全名
     /// </summary>
@@ -140,7 +147,7 @@ public record UpdateUserDto
     /// 默认分机号
     /// </summary>
     public string? DefaultTelNo { get; set; }
-    
+
     /// <summary>
     /// 默认分机组(技能组)
     /// </summary>