修改查看日志和项目列表过滤

2025-01-20 14:52:43 +08:00
parent 07b63077d1
commit 9bdb782b8d
2 changed files with 3 additions and 2 deletions
@@ -924,7 +924,7 @@ namespace IRaCIS.Core.Application.Service
            var userLogQueryable =
               _userLogRepository.AsQueryable().IgnoreQueryFilters()
                .WhereIf(inQuery.IdentityUserId != null, t => t.ActionIdentityUserId == inQuery.IdentityUserId)
-               .WhereIf(inQuery.TrialId != null, t => t.ActionIdentityUser.UserTrialList.Any(c => c.TrialId == inQuery.TrialId))
+               .WhereIf(inQuery.TrialId != null, t => t.ActionIdentityUser.UserTrialList.Any(c => c.TrialId == inQuery.TrialId) || t.TargetIdentityUser.UserTrialList.Any(c => c.TrialId == inQuery.TrialId))
               .WhereIf(trialCreateTime != null, t => t.CreateTime >= trialCreateTime)
               .WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType)
               .WhereIf(inQuery.BeginDate != null, t => t.CreateTime >= inQuery.BeginDate)