XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改时间
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
hang 2025-01-20 17:23:21 +08:00
parent bd4d6c8c5f
commit 68a57594ff
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
View File

@ -474,6 +474,8 @@ namespace IRaCIS.Application.Contracts
public UserTypeEnum? UserTypeEnum { get; set; } public UserTypeEnum? UserTypeEnum { get; set; }
public bool? IsUserRoleDisabled { get; set; } public bool? IsUserRoleDisabled { get; set; }
public string? EMail { get; set; }
} }
public class TrialUserScreeningDTO : TrialUserAddCommand public class TrialUserScreeningDTO : TrialUserAddCommand

3
IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
View File

@ -169,6 +169,7 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(inQuery.UserTypeEnum != null, t => t.UserTypeEnum == inQuery.UserTypeEnum) .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.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.EMail), t => t.IdentityUser.EMail.Contains(inQuery.EMail))
.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) .WhereIf(inQuery.IsUserRoleDisabled != null, t => t.IsUserRoleDisabled == inQuery.IsUserRoleDisabled)
.Select(t => new TrialUserRoleScreeningDto() .Select(t => new TrialUserRoleScreeningDto()
@ -227,7 +228,7 @@ namespace IRaCIS.Core.Application.Service
} }
else else
{ {
if (findTrialuser.IsDeleted = true) if (findTrialuser.IsDeleted == true)
{ {
findTrialuser.IsDeleted = false; findTrialuser.IsDeleted = false;
findTrialuser.DeletedTime = null; findTrialuser.DeletedTime = null;