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

修改用户类型筛选

Uat_Study
hang 2023-07-05 11:24:49 +08:00
parent 7789252f76
commit 311d651ba7
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
IRaCIS.Core.Application/Service/Management/UserTypeService.cs
View File

@ -115,13 +115,10 @@ namespace IRaCIS.Core.Application.Contracts
{ {
userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.PI, UserTypeEnum.MIM }; userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.PI, UserTypeEnum.MIM };
} }
if (userTypeSelectEnum == UserTypeSelectEnum.SiteSurvey) if (userTypeSelectEnum == UserTypeSelectEnum.SiteSurvey)
{ {
userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.SR, UserTypeEnum.ClinicalResearchCoordinator }; userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.SR, UserTypeEnum.ClinicalResearchCoordinator };
} }
@ -136,6 +133,10 @@ namespace IRaCIS.Core.Application.Contracts
userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.CRA, UserTypeEnum.ClinicalResearchCoordinator }; userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.CRA, UserTypeEnum.ClinicalResearchCoordinator };
} }
if (userTypeSelectEnum == UserTypeSelectEnum.TrialDoc)
{
userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.PI, UserTypeEnum.SR, UserTypeEnum.ProjectManager, UserTypeEnum.TA, UserTypeEnum.IQC, UserTypeEnum.IM, UserTypeEnum.MIM };
}
var query = _userTypeRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin) var query = _userTypeRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin)
@ -155,8 +156,12 @@ namespace IRaCIS.Core.Application.Contracts
/// <returns></returns> /// <returns></returns>
public async Task<List<TrialUserType>> GetTrialUserTypeList() public async Task<List<TrialUserType>> GetTrialUserTypeList()
{ {
var query = _userTypeRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin) var userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.PI, UserTypeEnum.SR, UserTypeEnum.ProjectManager, UserTypeEnum.TA, UserTypeEnum.IQC,UserTypeEnum.IM,UserTypeEnum.MIM };
.Where(t => !t.UserTypeGroupList.Any(t=> t.Group.Code=="3"))
var query = _userTypeRepository
// .Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin)
//.Where(t => !t.UserTypeGroupList.Any(t=> t.Group.Code=="3"))
.Where( t => userTypeEnums.Contains(t.UserTypeEnum))
.OrderBy(t => t.Order).ProjectTo<TrialUserType>(_mapper.ConfigurationProvider); .OrderBy(t => t.Order).ProjectTo<TrialUserType>(_mapper.ConfigurationProvider);
return await query.ToListAsync(); return await query.ToListAsync();

2
IRaCIS.Core.Domain.Share/User/UserType.cs
View File

@ -82,6 +82,8 @@
EnrollOrPD_EmailReceive = 4, EnrollOrPD_EmailReceive = 4,
EnrollOrPD_EMailCopy = 5, EnrollOrPD_EMailCopy = 5,
TrialDoc=6,
} }