Compare commits
2 Commits
0dae3c000c
...
212268cfa5
| Author | SHA1 | Date |
|---|---|---|
|
|
212268cfa5 | |
|
|
862da87a0c |
|
|
@ -58,7 +58,7 @@ namespace IRaCIS.Core.Application.ViewModel
|
|||
|
||||
public Guid? UserTypeId { get; set; }
|
||||
|
||||
public Guid? UserId { get; set; }
|
||||
public Guid? IdentityUserId { get; set; }
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -916,6 +916,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(trialCreateTime != null, t => t.CreateTime >= trialCreateTime)
|
||||
.WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType)
|
||||
|
|
|
|||
Loading…
Reference in New Issue