From 58888316e770acadecd9340adc41e3961d33cf3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=B4=AA=E6=9E=97?= <xianghl@cy-coo.com>
Date: Fri, 4 Sep 2020 16:00:55 +0800
Subject: [PATCH] add OrganizaitonUnit GetListAsync filter paramter

---
 .../Identity/IOrganizationUnitRepository.cs   |  1 +
 .../EfCoreOrganizationUnitRepository.cs       | 31 ++++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IOrganizationUnitRepository.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IOrganizationUnitRepository.cs
index 6650f62c82..e12d5a5f6d 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IOrganizationUnitRepository.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IOrganizationUnitRepository.cs
@@ -31,6 +31,7 @@ namespace Volo.Abp.Identity
             string sorting = null,
             int maxResultCount = int.MaxValue,
             int skipCount = 0,
+            string filter = null,
             bool includeDetails = false,
             CancellationToken cancellationToken = default
         );
diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs
index 7bdb7d6837..26dcc27426 100644
--- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs
+++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs
@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq.Dynamic.Core;
 using System.Linq;
 using System.Threading;
@@ -12,7 +13,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
 {
     public class EfCoreOrganizationUnitRepository
         : EfCoreRepository<IIdentityDbContext, OrganizationUnit, Guid>,
-          IOrganizationUnitRepository
+            IOrganizationUnitRepository
     {
         public EfCoreOrganizationUnitRepository(
             IDbContextProvider<IIdentityDbContext> dbContextProvider)
@@ -47,15 +48,20 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
             string sorting = null,
             int maxResultCount = int.MaxValue,
             int skipCount = 0,
+            string filter = null,
             bool includeDetails = true,
             CancellationToken cancellationToken = default)
         {
             return await DbSet
                 .IncludeDetails(includeDetails)
+                .WhereIf(!filter.IsNullOrWhiteSpace(),
+                    ou => ou.DisplayName.Contains(filter) ||
+                          ou.Code.Contains(filter))
                 .OrderBy(sorting ?? nameof(OrganizationUnit.DisplayName))
                 .PageBy(skipCount, maxResultCount)
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
+
         public virtual async Task<List<OrganizationUnit>> GetListAsync(
             IEnumerable<Guid> ids,
             bool includeDetails = false,
@@ -89,9 +95,9 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
             CancellationToken cancellationToken = default)
         {
             var query = from organizationRole in DbContext.Set<OrganizationUnitRole>()
-                        join role in DbContext.Roles.IncludeDetails(includeDetails) on organizationRole.RoleId equals role.Id
-                        where organizationRole.OrganizationUnitId == organizationUnit.Id
-                        select role;
+                join role in DbContext.Roles.IncludeDetails(includeDetails) on organizationRole.RoleId equals role.Id
+                where organizationRole.OrganizationUnitId == organizationUnit.Id
+                select role;
             query = query
                 .OrderBy(sorting ?? nameof(IdentityRole.Name))
                 .PageBy(skipCount, maxResultCount);
@@ -104,9 +110,9 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
             CancellationToken cancellationToken = default)
         {
             var query = from organizationRole in DbContext.Set<OrganizationUnitRole>()
-                        join role in DbContext.Roles on organizationRole.RoleId equals role.Id
-                        where organizationRole.OrganizationUnitId == organizationUnit.Id
-                        select role;
+                join role in DbContext.Roles on organizationRole.RoleId equals role.Id
+                where organizationRole.OrganizationUnitId == organizationUnit.Id
+                select role;
 
             return await query.CountAsync(GetCancellationToken(cancellationToken));
         }
@@ -119,13 +125,13 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
             string filter = null,
             bool includeDetails = false,
             CancellationToken cancellationToken = default
-            )
+        )
         {
             var query = CreateGetMembersFilteredQuery(organizationUnit, filter);
 
             return await query.IncludeDetails(includeDetails).OrderBy(sorting ?? nameof(IdentityUser.UserName))
-                        .PageBy(skipCount, maxResultCount)
-                        .ToListAsync(GetCancellationToken(cancellationToken));
+                .PageBy(skipCount, maxResultCount)
+                .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
         public virtual async Task<int> GetMembersCountAsync(
@@ -162,7 +168,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
             DbContext.Set<IdentityUserOrganizationUnit>().RemoveRange(ouMembersQuery);
         }
 
-        protected virtual IQueryable<IdentityUser> CreateGetMembersFilteredQuery(OrganizationUnit organizationUnit, string filter = null)
+        protected virtual IQueryable<IdentityUser> CreateGetMembersFilteredQuery(OrganizationUnit organizationUnit,
+            string filter = null)
         {
             var query = from userOu in DbContext.Set<IdentityUserOrganizationUnit>()
                 join user in DbContext.Users on userOu.UserId equals user.Id
@@ -181,4 +188,4 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
             return query;
         }
     }
-}
+}
\ No newline at end of file