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 passing Details

Test_IRC_Net8
hang 2025-07-03 10:13:50 +08:00
parent 7264c4a417 50d3974cdf
commit efb9532fbc
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2611,6 +2611,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
if (entity.ReadingScope == ReadingScopeEnum.Site) if (entity.ReadingScope == ReadingScopeEnum.Site)
{ {
var siteIds = entity.ReadingPeriodSites.Select(t => t.TrialSiteId).ToList(); var siteIds = entity.ReadingPeriodSites.Select(t => t.TrialSiteId).ToList();
if(siteIds == null || siteIds.Count == 0)
{
siteIds= await _dbContext.ReadingPeriodSite.Where(c => c.ReadingPeriodSetId== entity.Id).Select(t => t.TrialSiteId).ToListAsync();
}
var nameList = _dbContext.TrialSite.Where(c => c.TrialId == entity.TrialId && siteIds.Contains(c.Id)).Select(t => t.TrialSiteCode).ToList(); var nameList = _dbContext.TrialSite.Where(c => c.TrialId == entity.TrialId && siteIds.Contains(c.Id)).Select(t => t.TrialSiteCode).ToList();
siteCodes = String.Join(',', nameList); siteCodes = String.Join(',', nameList);

2
IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
View File

@ -461,6 +461,8 @@ public class IRaCISDBContext : DbContext
public virtual DbSet<TrialSiteUserRole> UserTrialSite { get; set; } public virtual DbSet<TrialSiteUserRole> UserTrialSite { get; set; }
public virtual DbSet<TrialSite> TrialSite { get; set; } public virtual DbSet<TrialSite> TrialSite { get; set; }
public virtual DbSet<ReadingPeriodSite> ReadingPeriodSite { get; set; }
public virtual DbSet<Site> Site { get; set; } public virtual DbSet<Site> Site { get; set; }
public virtual DbSet<UserRole> User { get; set; } public virtual DbSet<UserRole> User { get; set; }