xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:完善用户查询部门过滤

Browse Source
This commit is contained in:
橙子
2023-05-21 13:16:04 +08:00
parent b50f2b4c7e
commit 95a91a10b3
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/IDeptService.cs
View File

@@ -8,6 +8,6 @@ namespace Yi.Furion.Application.Rbac.Services
/// </summary> /// </summary>
public interface IDeptService : ICrudAppService<DeptGetOutputDto, DeptGetListOutputDto, long, DeptGetListInputVo, DeptCreateInputVo, DeptUpdateInputVo> public interface IDeptService : ICrudAppService<DeptGetOutputDto, DeptGetListOutputDto, long, DeptGetListInputVo, DeptCreateInputVo, DeptUpdateInputVo>
{ {
Task<List<long>> GetChiIds(long deptId);
} }
} }

6
Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/DeptService.cs
View File

@@ -12,6 +12,12 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
public class DeptService : CrudAppService<DeptEntity, DeptGetOutputDto, DeptGetListOutputDto, long, DeptGetListInputVo, DeptCreateInputVo, DeptUpdateInputVo>, public class DeptService : CrudAppService<DeptEntity, DeptGetOutputDto, DeptGetListOutputDto, long, DeptGetListInputVo, DeptCreateInputVo, DeptUpdateInputVo>,
IDeptService, ITransient, IDynamicApiController IDeptService, ITransient, IDynamicApiController
{ {
[NonAction]
public async Task<List<long>> GetChiIds(long deptId)
{
var entities= await _DbQueryable.ToChildListAsync(x=>x.ParentId,deptId);
return entities.Select(x => x.Id).ToList();
}
/// <summary> /// <summary>
/// 通过角色id查询该角色全部部门 /// 通过角色id查询该角色全部部门

15
Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/UserService.cs
View File

@@ -21,13 +21,13 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
{ {
public UserService(UserManager userManager, IUserRepository userRepository, ICurrentUser currentUser) => public UserService(UserManager userManager, IUserRepository userRepository, ICurrentUser currentUser, IDeptService deptService) =>
(_userManager, _userRepository, _currentUser) = (_userManager, _userRepository, _currentUser, _deptService) =
(userManager, userRepository, currentUser); (userManager, userRepository, currentUser, deptService);
private UserManager _userManager { get; set; } private UserManager _userManager { get; set; }
private IUserRepository _userRepository { get; set; } private IUserRepository _userRepository { get; set; }
private IDeptService _deptService { get; set; }
private ICurrentUser _currentUser { get; set; } private ICurrentUser _currentUser { get; set; }
@@ -42,6 +42,11 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
var entity = await MapToEntityAsync(input); var entity = await MapToEntityAsync(input);
RefAsync<int> total = 0; RefAsync<int> total = 0;
List<long> deptIds = null;
if (input.DeptId is not null)
{
deptIds= await _deptService.GetChiIds(input.DeptId ?? 0);
}
List<long> ids = input.Ids?.Split(",").Select(x => long.Parse(x)).ToList(); List<long> ids = input.Ids?.Split(",").Select(x => long.Parse(x)).ToList();
@@ -52,7 +57,7 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
.WhereIF(input.StartTime is not null && input.EndTime is not null, x => x.CreationTime >= input.StartTime && x.CreationTime <= input.EndTime) .WhereIF(input.StartTime is not null && input.EndTime is not null, x => x.CreationTime >= input.StartTime && x.CreationTime <= input.EndTime)
//这个为过滤当前部门，加入数据权限后，将由数据权限控制 //这个为过滤当前部门，加入数据权限后，将由数据权限控制
.WhereIF(input.DeptId is not null, x => x.DeptId == input.DeptId) .WhereIF(input.DeptId is not null, x => deptIds.Contains(x.DeptId??-1))
.WhereIF(ids is not null, x => ids.Contains(x.Id)) .WhereIF(ids is not null, x => ids.Contains(x.Id))