@@ -474,6 +474,8 @@ namespace IRaCIS.Application.Contracts
|
||||
public UserTypeEnum? UserTypeEnum { get; set; }
|
||||
|
||||
public bool? IsUserRoleDisabled { get; set; }
|
||||
|
||||
public string? EMail { get; set; }
|
||||
}
|
||||
|
||||
public class TrialUserScreeningDTO : TrialUserAddCommand
|
||||
|
||||
@@ -169,6 +169,7 @@ namespace IRaCIS.Core.Application.Service
|
||||
.WhereIf(inQuery.UserTypeEnum != null, t => t.UserTypeEnum == inQuery.UserTypeEnum)
|
||||
.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.EMail), t => t.IdentityUser.EMail.Contains(inQuery.EMail))
|
||||
.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()
|
||||
@@ -227,7 +228,7 @@ namespace IRaCIS.Core.Application.Service
|
||||
}
|
||||
else
|
||||
{
|
||||
if (findTrialuser.IsDeleted = true)
|
||||
if (findTrialuser.IsDeleted == true)
|
||||
{
|
||||
findTrialuser.IsDeleted = false;
|
||||
findTrialuser.DeletedTime = null;
|
||||
|
||||
Reference in New Issue
Block a user