新增角色用户列表

src/platform/ZhonTai.Admin/Domain/Employee/EmployeeEntity.cs

@@ -19,18 +19,18 @@ public partial class EmployeeEntity : EntityFull, ITenant
     [Column(Position = -10)]
     public long? TenantId { get; set; }
 
-    /// <summary>
-    /// 性别
-    /// </summary>
-    [Column(MapType = typeof(int))]
-    public SexEnum? Sex { get; set; }
-
     /// <summary>
     /// 工号
     /// </summary>
     [Column(StringLength = 20)]
     public string JobNumber { get; set; }
 
+    /// <summary>
+    /// 性别
+    /// </summary>
+    [Column(MapType = typeof(int))]
+    public SexEnum? Sex { get; set; }
+
     /// <summary>
     /// 主属部门Id
     /// </summary>

src/platform/ZhonTai.Admin/Domain/Role/Dto/UserGetRoleUserListInput.cs

@@ -0,0 +1,14 @@
+namespace ZhonTai.Admin.Domain.Role.Dto;
+
+public partial class UserGetRoleUserListInput
+{
+    /// <summary>
+    /// 姓名
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 角色Id
+    /// </summary>
+    public long? RoleId { get; set; }
+}

src/platform/ZhonTai.Admin/Domain/User/Dto/UserGetListInput.cs

@@ -1,9 +0,0 @@
-namespace ZhonTai.Admin.Domain.User.Dto;
-
-public partial class UserGetListInput
-{
-    /// <summary>
-    /// 姓名
-    /// </summary>
-    public string Name { get; set; }
-}

src/platform/ZhonTai.Admin/Services/User/Dto/UserGetListOutput.cs → src/platform/ZhonTai.Admin/Services/Role/Dto/UserGetRoleUserListOutput.cs

@@ -1,6 +1,6 @@
-namespace ZhonTai.Admin.Services.User.Dto;
+namespace ZhonTai.Admin.Services.Role.Dto;
 
-public class UserGetListOutput
+public class UserGetRoleUserListOutput
 {
     /// <summary>
     /// 主键Id

src/platform/ZhonTai.Admin/Services/Role/RoleService.cs

@@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Mvc;
 using ZhonTai.Admin.Core.Consts;
 using ZhonTai.Admin.Core.Attributes;
 using ZhonTai.Admin.Domain.UserRole;
-using System.DirectoryServices.Protocols;
+using ZhonTai.Admin.Domain.User;
 
 namespace ZhonTai.Admin.Services.Role;
 
@@ -23,6 +23,7 @@ namespace ZhonTai.Admin.Services.Role;
 public class RoleService : BaseService, IRoleService, IDynamicApi
 {
     private IRoleRepository _roleRepository => LazyGetRequiredService<IRoleRepository>();
+    private IUserRepository _userRepository => LazyGetRequiredService<IUserRepository>();
     private IRepositoryBase<UserRoleEntity> _userRoleRepository => LazyGetRequiredService<IRepositoryBase<UserRoleEntity>>();
     private IRepositoryBase<RolePermissionEntity> _rolePermissionRepository => LazyGetRequiredService<IRepositoryBase<RolePermissionEntity>>();
 
@@ -83,6 +84,24 @@ public class RoleService : BaseService, IRoleService, IDynamicApi
         return ResultOutput.Ok(data);
     }
 
+    /// <summary>
+    /// 查询角色用户列表
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    public async Task<IResultOutput> GetRoleUserListAsync([FromQuery] UserGetRoleUserListInput input)
+    {
+        var list = await _userRepository.Select.From<UserRoleEntity>()
+            .InnerJoin(a => a.t2.UserId == a.t1.Id)
+            .Where(a => a.t2.RoleId == input.RoleId)
+            .WhereIf(input.Name.NotNull(), a => a.t1.Name.Contains(input.Name))
+            .OrderByDescending(a => a.t1.Id)
+            .ToListAsync<UserGetRoleUserListOutput>();
+
+        return ResultOutput.Ok(list);
+    }
+
+
     /// <summary>
     /// 新增
     /// </summary>

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

@@ -18,8 +18,6 @@ public interface IUserService
 
     Task<IResultOutput> GetSelectAsync();
 
-    Task<IResultOutput> GetListAsync(UserGetListInput input);
-
     Task<IResultOutput> GetPageAsync(PageInput input);
 
     Task<IResultOutput> AddAsync(UserAddInput input);

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

@@ -22,9 +22,6 @@ using ZhonTai.DynamicApi;
 using ZhonTai.DynamicApi.Attributes;
 using ZhonTai.Admin.Core.Helpers;
 using ZhonTai.Admin.Core.Consts;
-using ZhonTai.Admin.Domain.User.Dto;
-using ZhonTai.Admin.Services.Role.Dto;
-using Org.BouncyCastle.Crypto;
 
 namespace ZhonTai.Admin.Services.User;
 
@@ -74,21 +71,6 @@ public class UserService : BaseService, IUserService, IDynamicApi
         return ResultOutput.Ok(new { Form = Mapper.Map<UserGetOutput>(entity), Select = new { roles } });
     }
 
-    /// <summary>
-    /// 查询列表
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    public async Task<IResultOutput> GetListAsync([FromQuery] UserGetListInput input)
-    {
-        var list = await _userRepository.Select
-        .WhereIf(input.Name.NotNull(), a => a.Name.Contains(input.Name))
-        .OrderByDescending(true, c => c.Id)
-        .ToListAsync<UserGetListOutput>();
-
-        return ResultOutput.Ok(list);
-    }
-
     /// <summary>
     /// 查询分页
     /// </summary>

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

@@ -1881,14 +1881,14 @@
             租户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.EmployeeEntity.Sex">
+        <member name="P:ZhonTai.Admin.Domain.Employee.EmployeeEntity.JobNumber">
             <summary>
-            性别
+            工号
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.EmployeeEntity.JobNumber">
+        <member name="P:ZhonTai.Admin.Domain.Employee.EmployeeEntity.Sex">
             <summary>
-            工号
+            性别
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Domain.Employee.EmployeeEntity.MainOrgId">
@@ -2486,6 +2486,16 @@
             名称
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.Role.Dto.UserGetRoleUserListInput.Name">
+            <summary>
+            姓名
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Role.Dto.UserGetRoleUserListInput.RoleId">
+            <summary>
+            角色Id
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Domain.Role.RoleEntity">
             <summary>
             角色
@@ -2731,11 +2741,6 @@
             备注
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.User.Dto.UserGetListInput.Name">
-            <summary>
-            姓名
-            </summary>
-        </member>
         <member name="T:ZhonTai.Admin.Domain.User.UserEntity">
             <summary>
             用户
@@ -5210,6 +5215,16 @@
             版本
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.Role.Dto.UserGetRoleUserListOutput.Id">
+            <summary>
+            主键Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.Role.Dto.UserGetRoleUserListOutput.Name">
+            <summary>
+            姓名
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Services.Role.IRoleService">
             <summary>
             角色接口
@@ -5241,6 +5256,13 @@
             <param name="input"></param>
             <returns></returns>
         </member>
+        <member name="M:ZhonTai.Admin.Services.Role.RoleService.GetRoleUserListAsync(ZhonTai.Admin.Domain.Role.Dto.UserGetRoleUserListInput)">
+            <summary>
+            查询角色用户列表
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="M:ZhonTai.Admin.Services.Role.RoleService.AddAsync(ZhonTai.Admin.Services.Role.Dto.RoleAddInput)">
             <summary>
             新增
@@ -5736,16 +5758,6 @@
             版本
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetListOutput.Id">
-            <summary>
-            主键Id
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetListOutput.Name">
-            <summary>
-            姓名
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.Id">
             <summary>
             主键Id
@@ -5868,13 +5880,6 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Admin.Services.User.UserService.GetListAsync(ZhonTai.Admin.Domain.User.Dto.UserGetListInput)">
-            <summary>
-            查询列表
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
         <member name="M:ZhonTai.Admin.Services.User.UserService.GetPageAsync(ZhonTai.Admin.Core.Dto.PageInput)">
             <summary>
             查询分页