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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is running Details

Test_IRC_Net8
he 2026-01-29 11:17:47 +08:00
parent e00f8b3549 dee8c90319
commit 3b5a735abf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs
View File

@ -56,6 +56,7 @@ public class UserSiteSurveySubmitedEventConsumer(
if (emailConfig != null) if (emailConfig != null)
{ {
var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
var trialUserList = await _trialUserRoleRepository.Where(t => t.TrialId == siteSurveyInfo.TrialId && t.TrialUser.IsDeleted == false) var trialUserList = await _trialUserRoleRepository.Where(t => t.TrialId == siteSurveyInfo.TrialId && t.TrialUser.IsDeleted == false)
.Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM || t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserRole.UserTypeEnum == UserTypeEnum.APM) .Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM || t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserRole.UserTypeEnum == UserTypeEnum.APM)
@ -68,8 +69,8 @@ public class UserSiteSurveySubmitedEventConsumer(
var toUserName = string.Empty; var toUserName = string.Empty;
//有SPM //有SPM 并且参与
if (sPMOrCPMList.Count > 0) if (trialInfo.IsSPMJoinSiteSurvey && sPMOrCPMList.Count > 0)
{ {
foreach (var user in sPMOrCPMList) foreach (var user in sPMOrCPMList)
{ {
@ -97,7 +98,6 @@ public class UserSiteSurveySubmitedEventConsumer(
//发件地址 //发件地址
messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
var siteInfo = await _trialSiteRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.Id == siteSurveyInfo.TrialSiteId, true); var siteInfo = await _trialSiteRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.Id == siteSurveyInfo.TrialSiteId, true);

2
IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
View File

@ -1115,7 +1115,7 @@ namespace IRaCIS.Core.Application.Services
return ResponseOutput.NotOk(_localizer["TrialD_DuplicateFileInProject"]); return ResponseOutput.NotOk(_localizer["TrialD_DuplicateFileInProject"]);
} }
var document = (await _trialDocumentRepository.Where(t => t.Id == addOrEditTrialDocument.Id, true).Include(t => t.NeedConfirmedUserTypeList).FirstOrDefaultAsync()).IfNullThrowException(); var document = (await _trialDocumentRepository.Where(t => t.Id == addOrEditTrialDocument.Id, true,true).Include(t => t.NeedConfirmedUserTypeList).FirstOrDefaultAsync()).IfNullThrowException();
bool beforeIsPublish = document.IsPublish; bool beforeIsPublish = document.IsPublish;
bool beforeIsDeleted = document.IsDeleted; bool beforeIsDeleted = document.IsDeleted;