优化用户查询

src/platform/ZhonTai.Admin/Services/User/Dto/UserGetPageOutput.cs

@@ -1,4 +1,7 @@
-using System;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using ZhonTai.Admin.Domain.Role;
 
 namespace ZhonTai.Admin.Services.User.Dto;
 
@@ -20,24 +23,22 @@ public class UserGetPageOutput
     public string Name { get; set; }
 
     /// <summary>
-    /// 昵称
+    /// 手机号
     /// </summary>
-    public string NickName { get; set; }
+    public string Mobile { get; set; }
 
     /// <summary>
-    /// 状态
+    /// 邮箱
     /// </summary>
-    public int Status { get; set; }
+    public string Email { get; set; }
 
     /// <summary>
     /// 角色
     /// </summary>
     public string[] RoleNames { get; set; }
 
-    /// <summary>
-    /// 备注
-    /// </summary>
-    public string Remark { get; set; }
+    [JsonIgnore]
+    public ICollection<RoleEntity> Roles { get; set; }
 
     /// <summary>
     /// 创建时间

src/platform/ZhonTai.Admin/Services/User/UserService.cs

@@ -25,6 +25,7 @@ using ZhonTai.Admin.Core.Consts;
 using ZhonTai.Admin.Domain.Employee;
 using ZhonTai.Admin.Domain;
 using ZhonTai.Admin.Domain.Organization;
+using System.Data;
 
 namespace ZhonTai.Admin.Services.User;
 
@@ -93,7 +94,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
         .OrderByDescending(true, a => a.Id)
         .IncludeMany(a => a.Roles.Select(b => new RoleEntity { Name = b.Name }))
         .Page(input.CurrentPage, input.PageSize)
-        .ToListAsync();
+        .ToListAsync(a=>new UserGetPageOutput { Roles = a.Roles });
 
         var data = new PageOutput<UserGetPageOutput>()
         {

src/platform/ZhonTai.Admin/Services/User/_MapConfig.cs

@@ -13,7 +13,7 @@ public class MapConfig : IRegister
     public void Register(TypeAdapterConfig config)
     {
         config
-        .NewConfig<UserEntity, UserGetPageOutput>()
+        .NewConfig<UserGetPageOutput, UserGetPageOutput>()
         .Map(dest => dest.RoleNames, src => src.Roles.Select(a => a.Name));
     }
 }

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -5798,14 +5798,14 @@
             姓名
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.NickName">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.Mobile">
             <summary>
-            昵称
+            手机号
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.Status">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.Email">
             <summary>
-            状态
+            邮箱
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.RoleNames">
@@ -5813,11 +5813,6 @@
             角色
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.Remark">
-            <summary>
-            备注
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.CreatedTime">
             <summary>
             创建时间