From 350aa66d4818f85f042cb2d399691209dc97b97e Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 06 八月 2025 14:46:54 +0800
Subject: [PATCH] feat:字典开发

---
 FlexJobApi.User.Application/Roles/Queries/GetRolesQueryHandler.cs |   55 +++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/FlexJobApi.User.Application/Roles/Queries/GetRolesQueryHandler.cs b/FlexJobApi.User.Application/Roles/Queries/GetRolesQueryHandler.cs
index 49fd796..30e1a86 100644
--- a/FlexJobApi.User.Application/Roles/Queries/GetRolesQueryHandler.cs
+++ b/FlexJobApi.User.Application/Roles/Queries/GetRolesQueryHandler.cs
@@ -1,5 +1,6 @@
 锘縰sing FlexJobApi.Core;
 using Furion.DatabaseAccessor;
+using Mapster;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using System;
@@ -13,26 +14,56 @@
     /// <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);
-            }
-            throw new NotImplementedException();
+
+            return result;
         }
     }
 }

--
Gitblit v1.9.1