diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs index e1f5423e5..aca922846 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs @@ -483,6 +483,8 @@ namespace IRaCIS.Application.Contracts public string OrganizationName { get; set; } = String.Empty; public UserTypeEnum? UserTypeEnum { get; set; } + + public bool? IsUserRoleDisabled { get; set; } } public class TrialUserScreeningDTO : TrialUserAddCommand diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs index 19452604d..185c13a10 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs @@ -6,6 +6,7 @@ using IRaCIS.Core.Application.Filter; using IRaCIS.Core.Domain.Share; using MassTransit.Serialization; using Microsoft.AspNetCore.Mvc; +using System; namespace IRaCIS.Core.Application.Service { @@ -62,7 +63,7 @@ namespace IRaCIS.Core.Application.Service UserTypeShortName = ur.UserRole.UserTypeRole.UserTypeShortName, IsDeleted = ur.IsDeleted, CreateTime = ur.CreateTime, - UserTypeEnum=ur.UserRole.UserTypeEnum, + UserTypeEnum = ur.UserRole.UserTypeEnum, UpdateTime = ur.UpdateTime }).ToList() }); @@ -143,6 +144,7 @@ namespace IRaCIS.Core.Application.Service .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => t.IdentityUser.FullName.Contains(inQuery.UserRealName)) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserName), t => t.IdentityUser.UserName.Contains(inQuery.UserName)) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.OrganizationName), t => t.IdentityUser.OrganizationName.Contains(inQuery.OrganizationName)) + .WhereIf(inQuery.IsUserRoleDisabled != null, t => t.IsUserRoleDisabled == inQuery.IsUserRoleDisabled) .Select(t => new TrialUserRoleScreeningDto() { Id = t.Id, @@ -158,7 +160,7 @@ namespace IRaCIS.Core.Application.Service }); - return await query.ToPagedListAsync(inQuery,nameof(TrialUserRoleScreeningDto.EMail)); + return await query.ToPagedListAsync(inQuery, nameof(TrialUserRoleScreeningDto.EMail)); }