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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
he 2023-04-10 17:21:59 +08:00
parent b00ac06cee 04dd15df5f
commit e4d9bdf998
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,7 +154,7 @@ namespace IRaCIS.Core.Application.Services
FileType = sysDoc.FileType.MappedValue, FileType = sysDoc.FileType.MappedValue,
UpdateTime = sysDoc.UpdateTime, UpdateTime = sysDoc.UpdateTime,
FullFilePath = sysDoc.Path + "?access_token=" + _userInfo.UserToken, FullFilePath = sysDoc.Path ,
ConfirmUserId = confirm.ConfirmUserId, ConfirmUserId = confirm.ConfirmUserId,
ConfirmTime = confirm.ConfirmTime, ConfirmTime = confirm.ConfirmTime,

1
IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
View File

@ -152,6 +152,7 @@ namespace IRaCIS.Core.Application.Contracts
/// <returns></returns> /// <returns></returns>
/// <exception cref="BusinessValidationFailedException"></exception> /// <exception cref="BusinessValidationFailedException"></exception>
[HttpPost] [HttpPost]
[UnitOfWork]
[AllowAnonymous] [AllowAnonymous]
[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
public async Task<IResponseOutput> VerifySendCode(LoginDto userInfo, [FromServices] ITokenService _tokenService) public async Task<IResponseOutput> VerifySendCode(LoginDto userInfo, [FromServices] ITokenService _tokenService)

6
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -1056,7 +1056,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as TrialSiteSurvey; var entity = item.Entity as TrialSiteSurvey;
if (entity.TrialSite == null) if (entity.TrialSite == null)
{ {
entity.TrialSite = await _dbContext.TrialSite.Where(x => x.SiteId == entity.SiteId && x.TrialId == entity.TrialId).FirstOrDefaultAsync(); entity.TrialSite = await _dbContext.TrialSite.IgnoreQueryFilters().Where(x => x.SiteId == entity.SiteId && x.TrialId == entity.TrialId).FirstOrDefaultAsync();
} }
if (entity.PreliminaryUser == null) if (entity.PreliminaryUser == null)
@ -1069,9 +1069,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
entity.ReviewerUser = await _dbContext.User.Where(x => x.Id == entity.ReviewerUserId).FirstOrDefaultAsync(); entity.ReviewerUser = await _dbContext.User.Where(x => x.Id == entity.ReviewerUserId).FirstOrDefaultAsync();
} }
var trialSiteId = entity.TrialSite?.Id;
await InsertInspection<TrialSiteSurvey>(item.Entity as TrialSiteSurvey, type, x => new InspectionConvertDTO() await InsertInspection<TrialSiteSurvey>(item.Entity as TrialSiteSurvey, type, x => new InspectionConvertDTO()
{ {
ObjectRelationParentId = entity.TrialSite.Id, ObjectRelationParentId = trialSiteId,
}, new }, new
{ {