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

修改内部人员 查询列表接口

Uat_IRC_Net8
hang 2024-12-31 10:19:25 +08:00
parent a8ec762a7d
commit 2691da82ae
2 changed files with 6 additions and 2 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

@ -483,6 +483,8 @@ 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
IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
View File

@ -6,6 +6,7 @@ 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
{ {
@ -62,7 +63,7 @@ namespace IRaCIS.Core.Application.Service
UserTypeShortName = ur.UserRole.UserTypeRole.UserTypeShortName, UserTypeShortName = ur.UserRole.UserTypeRole.UserTypeShortName,
IsDeleted = ur.IsDeleted, IsDeleted = ur.IsDeleted,
CreateTime = ur.CreateTime, CreateTime = ur.CreateTime,
UserTypeEnum=ur.UserRole.UserTypeEnum, UserTypeEnum = ur.UserRole.UserTypeEnum,
UpdateTime = ur.UpdateTime UpdateTime = ur.UpdateTime
}).ToList() }).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.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,
@ -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));
} }