Compare commits

..

No commits in common. "fcaa6339c61f3d7129472e41e7194fb537b906e2" and "7b779d4ef55f4177ce1961bec597e0694dbcc4ef" have entirely different histories.

2 changed files with 2 additions and 4 deletions

View File

@ -62,7 +62,6 @@ namespace IRaCIS.Core.Application.Contracts
public bool? IsDistinguishCriteria { get; set; } public bool? IsDistinguishCriteria { get; set; }
public SysEmailLevel? SystemLevel { get; set; } public SysEmailLevel? SystemLevel { get; set; }
public int? BusinessModuleEnum { get; set; }
} }

View File

@ -1249,7 +1249,6 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(inQuery.IsReturnRequired != null, t => t.IsReturnRequired == inQuery.IsReturnRequired) .WhereIf(inQuery.IsReturnRequired != null, t => t.IsReturnRequired == inQuery.IsReturnRequired)
.WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable) .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable)
.WhereIf(inQuery.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == inQuery.IsDistinguishCriteria) .WhereIf(inQuery.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == inQuery.IsDistinguishCriteria)
.WhereIf(inQuery.BusinessModuleEnum != null, t => t.BusinessModuleEnum == inQuery.BusinessModuleEnum)
.ProjectTo<TrialSelectEmailNoticeConfigView>(_mapper.ConfigurationProvider, new { trialId = inQuery.TrialId }); .ProjectTo<TrialSelectEmailNoticeConfigView>(_mapper.ConfigurationProvider, new { trialId = inQuery.TrialId });
return await emailNoticeConfigQueryable.ToPagedListAsync(inQuery); return await emailNoticeConfigQueryable.ToPagedListAsync(inQuery);
@ -1294,8 +1293,8 @@ namespace IRaCIS.Core.Application.Service
item.SMTPServerAddress = emailConfig.EmailSMTPServerAddress; item.SMTPServerAddress = emailConfig.EmailSMTPServerAddress;
item.FromName = emailConfig.EmailFromName; item.FromName = emailConfig.EmailFromName;
item.SMTPServerPort = emailConfig.EmailSMTPServerPort; item.SMTPServerPort = emailConfig.EmailSMTPServerPort;
item.IsAutoSend = true; item.IsAutoSend = false;
item.IsEnable = true; item.IsEnable = false;
item.TrialReadingCriterionId = list.FirstOrDefault(t => t.CriterionType == item.CriterionTypeEnum)?.TrialReadingCriterionId; item.TrialReadingCriterionId = list.FirstOrDefault(t => t.CriterionType == item.CriterionTypeEnum)?.TrialReadingCriterionId;