xf 2 anni fa
parent
commit
23f3fc46dc

+ 4 - 2
src/Hotline.Api/Controllers/UserController.cs

@@ -12,8 +12,10 @@ using XF.Domain.Exceptions;
 using XF.Utility.AppIdentityModel;
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.Users;
+using Hotline.Share.Enums.Order;
 using Microsoft.Extensions.Options;
 using XF.Domain.Options;
+using XF.Utility.EnumExtensions;
 
 namespace Hotline.Api.Controllers;
 
@@ -102,7 +104,7 @@ public class UserController : BaseController
              .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                  d => d.Name.Contains(dto.Keyword!) || d.PhoneNo.Contains(dto.Keyword!))
              .WhereIF(!string.IsNullOrEmpty(dto.OrgCode), d => d.OrgCode == dto.OrgCode)
-             .WhereIF(!string.IsNullOrEmpty(dto.Role), d => d.Account.Roles.Select(d => d.DisplayName).Contains(dto.Role))
+             .WhereIF(!string.IsNullOrEmpty(dto.Role), d => d.Account.Roles.Any(x=>x.Id == dto.Role))
              .OrderBy(d => d.Account.Status)
              .OrderBy(d => d.Organization.OrgCode)
              .OrderByDescending(d => d.CreationTime)
@@ -314,7 +316,7 @@ public class UserController : BaseController
     {
         return new
         {
-            //GenderOptions = 
+            GenderOptions = EnumExts.GetDescriptions<EGender>()
         };
     }
 }

+ 3 - 0
src/Hotline.Share/Dtos/Users/UserDto.cs

@@ -1,4 +1,5 @@
 using Hotline.Share.Enums.Order;
+using XF.Utility.EnumExtensions;
 
 namespace Hotline.Share.Dtos.Users;
 
@@ -7,6 +8,8 @@ public record UserDto : AddUserDto
 {
     public string Id { get; set; }
 
+    public string GenderText => Gender.GetDescription();
+
     public DateTime CreationTime { get; set; }
 
     public string OrgName { get; set; }

+ 9 - 1
src/Hotline.Share/Enums/Order/EGender.cs

@@ -1,11 +1,19 @@
-namespace Hotline.Share.Enums.Order;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace Hotline.Share.Enums.Order;
 
 /// <summary>
 /// 性别
 /// </summary>
 public enum EGender
 {
+    [Description("未知")]
     Unknown = 0,
+
+    [Description("男性")]
     Male = 1,
+    
+    [Description("女性")]
     Female = 2,
 }