From 744ce126fd5dc3a0448719832d1e9667e44d30b5 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 06 八月 2025 18:39:52 +0800
Subject: [PATCH] fix:bug
---
FlexJobApi.User.Application/Roles/Queries/GetRolesQueryHandler.cs | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/FlexJobApi.User.Application/Roles/Queries/GetRolesQueryHandler.cs b/FlexJobApi.User.Application/Roles/Queries/GetRolesQueryHandler.cs
index 895ddf3..30e1a86 100644
--- a/FlexJobApi.User.Application/Roles/Queries/GetRolesQueryHandler.cs
+++ b/FlexJobApi.User.Application/Roles/Queries/GetRolesQueryHandler.cs
@@ -15,6 +15,7 @@
/// 鏌ヨ瑙掕壊鍒嗛〉鍒楄〃
/// </summary>
/// <param name="repRole"></param>
+ /// <param name="repUserInfoRole"></param>
public class GetRolesQueryHandler(
IRepository<Role> repRole,
IRepository<UserInfoRole> repUserInfoRole
@@ -26,22 +27,24 @@
/// <inheritdoc/>
public async Task<PagedListQueryResult<GetRolesQueryResultItem>> Handle(GetRolesQuery request, CancellationToken cancellationToken)
{
- var q = repRole.AsQueryable().AsNoTracking();
- 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));
- }
- var result = await q
- .ProjectToType<GetRolesQueryResultItem>()
- .ToPagedListAsync(request.PageModel, cancellationToken);
+ 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())
{
--
Gitblit v1.9.1