用户分页查询新增过滤条件dto

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

@@ -0,0 +1,12 @@
+namespace ZhonTai.Admin.Services.User.Dto;
+
+/// <summary>
+/// 用户分页查询条件
+/// </summary>
+public class UserGetPageDto
+{
+    /// <summary>
+    /// 部门Id
+    /// </summary>
+    public long? OrgId { get; set; }
+}

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

@@ -1,5 +1,4 @@
-using Mapster;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using ZhonTai.Admin.Domain.Role;

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

@@ -16,7 +16,7 @@ public interface IUserService
 {
     Task<UserGetOutput> GetAsync(long id);
 
-    Task<PageOutput<UserGetPageOutput>> GetPageAsync(PageInput<long?> input);
+    Task<PageOutput<UserGetPageOutput>> GetPageAsync(PageInput<UserGetPageDto> input);
 
     Task<AuthLoginOutput> GetLoginUserAsync(long id);
 

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

@@ -95,9 +95,9 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// <param name="input"></param>
     /// <returns></returns>
     [HttpPost]
-    public async Task<PageOutput<UserGetPageOutput>> GetPageAsync(PageInput<long?> input)
+    public async Task<PageOutput<UserGetPageOutput>> GetPageAsync(PageInput<UserGetPageDto> input)
     {
-        var orgId = input.Filter;
+        var orgId = input.Filter?.OrgId;
         var list = await _userRepository.Select
         .WhereIf(orgId.HasValue && orgId > 0, a => _userOrgRepository.Where(b => b.UserId == a.Id && b.OrgId == orgId).Any())
         .Where(a=>a.Type != UserType.Member)

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

@@ -5669,6 +5669,16 @@
             角色Ids
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Services.User.Dto.UserGetPageDto">
+            <summary>
+            用户分页查询条件
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageDto.OrgId">
+            <summary>
+            部门Id
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.Id">
             <summary>
             主键Id
@@ -5841,7 +5851,7 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Admin.Services.User.UserService.GetPageAsync(ZhonTai.Admin.Core.Dto.PageInput{System.Nullable{System.Int64}})">
+        <member name="M:ZhonTai.Admin.Services.User.UserService.GetPageAsync(ZhonTai.Admin.Core.Dto.PageInput{ZhonTai.Admin.Services.User.Dto.UserGetPageDto})">
             <summary>
             查询分页
             </summary>