Compare commits
No commits in common. "28a56ee298a73648ef9df26bccebf7610e94426f" and "c5519976eeb75c209e3af0870c7a87d676b195a1" have entirely different histories.
28a56ee298
...
c5519976ee
|
|
@ -483,8 +483,6 @@ namespace IRaCIS.Application.Contracts
|
||||||
public string OrganizationName { get; set; } = String.Empty;
|
public string OrganizationName { get; set; } = String.Empty;
|
||||||
|
|
||||||
public UserTypeEnum? UserTypeEnum { get; set; }
|
public UserTypeEnum? UserTypeEnum { get; set; }
|
||||||
|
|
||||||
public bool? IsUserRoleDisabled { get; set; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class TrialUserScreeningDTO : TrialUserAddCommand
|
public class TrialUserScreeningDTO : TrialUserAddCommand
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ using IRaCIS.Core.Application.Filter;
|
||||||
using IRaCIS.Core.Domain.Share;
|
using IRaCIS.Core.Domain.Share;
|
||||||
using MassTransit.Serialization;
|
using MassTransit.Serialization;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using System;
|
|
||||||
|
|
||||||
namespace IRaCIS.Core.Application.Service
|
namespace IRaCIS.Core.Application.Service
|
||||||
{
|
{
|
||||||
|
|
@ -144,7 +143,6 @@ namespace IRaCIS.Core.Application.Service
|
||||||
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => t.IdentityUser.FullName.Contains(inQuery.UserRealName))
|
.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.UserName), t => t.IdentityUser.UserName.Contains(inQuery.UserName))
|
||||||
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.OrganizationName), t => t.IdentityUser.OrganizationName.Contains(inQuery.OrganizationName))
|
.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()
|
.Select(t => new TrialUserRoleScreeningDto()
|
||||||
{
|
{
|
||||||
Id = t.Id,
|
Id = t.Id,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue