Merge branch 'Test.Study' of http://192.168.3.69:3000/XCKJ/irc-netcore-api into Test.Study
commit
cc823daee5
|
@ -395,7 +395,15 @@ namespace IRaCIS.Core.Application.Service
|
||||||
//去除黑名单
|
//去除黑名单
|
||||||
toUserList = toUserList.Where(t => !blackUserIdList.Contains(t.UserId)).ToList();
|
toUserList = toUserList.Where(t => !blackUserIdList.Contains(t.UserId)).ToList();
|
||||||
|
|
||||||
var copyUserList = allUserList.Where(t => copyUserTypeEnumList.Contains(t.UserTypeEnum)).Where(t => !blackUserIdList.Contains(t.UserId)).ToList();
|
var copyUserList = allUserList.Where(t => copyUserTypeEnumList.Contains(t.UserTypeEnum))
|
||||||
|
.Where(t => !blackUserIdList.Contains(t.UserId)).ToList();
|
||||||
|
|
||||||
|
if (siteId != null && copyUserTypeEnumList.Any(t => t == UserTypeEnum.ClinicalResearchCoordinator || t == UserTypeEnum.CRA))
|
||||||
|
{
|
||||||
|
var curentSiteUserIdList = _repository.Where<TrialSiteUser>(t => t.TrialId == trialId && t.SiteId == siteId).Select(t => t.UserId).ToList();
|
||||||
|
|
||||||
|
copyUserList = copyUserList.Where(t => (t.UserTypeEnum != UserTypeEnum.CRA && t.UserTypeEnum != UserTypeEnum.ClinicalResearchCoordinator) || curentSiteUserIdList.Contains(t.UserId)).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
if (onlyToUserId != null)
|
if (onlyToUserId != null)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue