From 82dbcc7ad9aeae270449139278dc9693de4ad218 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 06 八月 2025 16:58:59 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob
---
FlexJobApi.User.Application/Roles/Queries/GetRolesQueryHandler.cs | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/FlexJobApi.User.Application/Roles/Queries/GetRolesQueryHandler.cs b/FlexJobApi.User.Application/Roles/Queries/GetRolesQueryHandler.cs
index 7ecb4e0..30e1a86 100644
--- a/FlexJobApi.User.Application/Roles/Queries/GetRolesQueryHandler.cs
+++ b/FlexJobApi.User.Application/Roles/Queries/GetRolesQueryHandler.cs
@@ -14,28 +14,54 @@
/// <summary>
/// 鏌ヨ瑙掕壊鍒嗛〉鍒楄〃
/// </summary>
- /// <param name="rep"></param>
+ /// <param name="repRole"></param>
+ /// <param name="repUserInfoRole"></param>
public class GetRolesQueryHandler(
- IRepository<Role> rep
+ IRepository<Role> repRole,
+ IRepository<UserInfoRole> repUserInfoRole
) : IRequestHandler<GetRolesQuery, PagedListQueryResult<GetRolesQueryResultItem>>
{
- private readonly IRepository<Role> rep = rep;
+ private readonly IRepository<Role> repRole = repRole;
+ private readonly IRepository<UserInfoRole> repUserInfoRole = repUserInfoRole;
/// <inheritdoc/>
- public Task<PagedListQueryResult<GetRolesQueryResultItem>> Handle(GetRolesQuery request, CancellationToken cancellationToken)
+ public async Task<PagedListQueryResult<GetRolesQueryResultItem>> Handle(GetRolesQuery request, CancellationToken cancellationToken)
{
- var q = rep.AsQueryable().AsNoTracking();
- if (request.UserType.HasValue)
+ var result = await request.PageModel.GetPagedListAsync<Role, GetRolesQueryResultItem>(
+ q =>
+ {
+ q = q.OrderBy(it => it.Sort).ThenBy(it => it.CreatedTime);
+ if (request.UserType.HasValue)
+ {
+ q = q.Where(it => it.UserType == request.UserType);
+ }
+ if (request.ClientType.HasValue)
+ {
+ q = q.Where(it => it.ClientType == request.ClientType);
+ }
+ if (request.Keywords.IsNotNull())
+ {
+ q = q.Where(it => it.Name.Contains(request.Keywords) || it.Remark.Contains(request.Keywords));
+ }
+ return q;
+ }, cancellationToken: cancellationToken);
+
+ if (result.Data.Any())
{
- q = q.Where(it => it.UserType == request.UserType);
+ var ids = result.Data.DistinctSelect(it => it.Id);
+ var userInfoRoles = await repUserInfoRole.AsQueryable().AsNoTracking()
+ .Where(it => ids.Contains(it.RoleId))
+ .Select(it => new
+ {
+ it.UserInfoId,
+ it.RoleId
+ })
+ .ToListAsync();
+ foreach (var item in result.Data)
+ {
+ item.UserCount = userInfoRoles.Count(it => it.RoleId == item.Id);
+ }
}
- if (request.ClientType.HasValue)
- {
- q = q.Where(it => it.ClientType == request.ClientType);
- }
- var result = q
- .ProjectToType<GetRolesQueryResultItem>()
- .ToPagedListAsync(request.PageModel, cancellationToken);
return result;
}
--
Gitblit v1.9.1