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

修改

Uat_Study
he 2022-05-20 16:53:36 +08:00
parent dd7c710c90
commit 73fa081d50
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
View File

@ -182,7 +182,7 @@ namespace IRaCIS.Core.Application.Services
{ {
var query = _trialSiteUserRepository.Where(t => t.TrialId == trialId && t.SiteId == siteId).IgnoreQueryFilters() var query = _trialSiteUserRepository.Where(t => t.TrialId == trialId && t.SiteId == siteId).IgnoreQueryFilters()
.ProjectTo<UserTrialDTO>(_mapper.ConfigurationProvider); .ProjectTo<UserTrialDTO>(_mapper.ConfigurationProvider);
return await query.ToListAsync(); return await query.ToListAsync();
} }
@ -290,7 +290,8 @@ namespace IRaCIS.Core.Application.Services
await _trialSiteUserRepository.AddRangeAsync(addArray); await _trialSiteUserRepository.AddRangeAsync(addArray);
return ResponseOutput.Result(await _trialSiteUserRepository.SaveChangesAsync()); await _trialSiteUserRepository.SaveChangesAsync();
return ResponseOutput.Result(true);
} }
/// <summary> 删除CRC人员</summary> /// <summary> 删除CRC人员</summary>

3
IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs
View File

@ -62,8 +62,7 @@ namespace IRaCIS.Core.Domain.Models
[ForeignKey("UserId")] [ForeignKey("UserId")]
public TrialUser TrialUser { get; set; } public TrialUser TrialUser { get; set; }
[ForeignKey("UserId")]
public UserType UserTypeRole { get; set; }
} }

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

@ -303,7 +303,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as TrialSiteUser; var entity = item.Entity as TrialSiteUser;
if (entity.TrialSite == null) if (entity.TrialSite == null)
{ {
entity.TrialSite= await _dbContext.TrialSite.Where(x => x.TrialId == entity.TrialId&&x.SiteId== entity.SiteId).FirstOrDefaultAsync(); entity.TrialSite = await _dbContext.TrialSite.Where(x => x.TrialId == entity.TrialId && x.SiteId == entity.SiteId).FirstOrDefaultAsync();
} }
if (entity.Site == null) if (entity.Site == null)
@ -311,16 +311,24 @@ namespace IRaCIS.Core.Infra.EFCore.Common
entity.Site = await _dbContext.Site.Where(x => x.Id == entity.SiteId).FirstOrDefaultAsync(); entity.Site = await _dbContext.Site.Where(x => x.Id == entity.SiteId).FirstOrDefaultAsync();
} }
var user = new User();
if (entity.User == null) if (entity.User == null)
{ {
entity.User = await _dbContext.User.Where(x => x.Id == entity.UserId).FirstOrDefaultAsync(); user = await _dbContext.User.Where(x => x.Id == entity.UserId).FirstOrDefaultAsync();
} }
else
if (entity.UserTypeRole == null)
{ {
entity.UserTypeRole = await _dbContext.UserType.Where(x => x.Id == entity.User.UserTypeId).FirstOrDefaultAsync(); user = entity.User;
} }
// 这里有问题
UserType userType = new UserType();
userType = await _dbContext.UserType.Where(x => x.Id == user.UserTypeId).FirstOrDefaultAsync();
await InsertInspection<TrialSiteUser>(item, type, x => new DataInspection() await InsertInspection<TrialSiteUser>(item, type, x => new DataInspection()
{ {
GeneralId = x.Id, GeneralId = x.Id,
@ -332,13 +340,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common
City = entity.Site.City, City = entity.Site.City,
Country = entity.Site.Country, Country = entity.Site.Country,
Status = entity.IsDeleted ? "禁用" : "启用", Status = entity.IsDeleted ? "禁用" : "启用",
UserName = entity.User.UserName, UserName = user.UserName,
UserRealName = entity.User.FullName, UserRealName = user.FullName,
UserType= entity.UserTypeRole.UserTypeShortName, UserType = userType.UserTypeShortName,
Phone= entity.User.Phone, Phone = user.Phone,
Email= entity.User.EMail, Email = user.EMail,
Organization= entity.User.OrganizationName, Organization = entity.User.OrganizationName,
}); });
} }