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

Uat_IRC_Net8
he 2025-01-09 15:34:54 +08:00
parent 9362d29fae 212268cfa5
commit 7b52c0b785
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
View File

@ -58,7 +58,7 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid? UserTypeId { get; set; } public Guid? UserTypeId { get; set; }
public Guid? UserId { get; set; } public Guid? IdentityUserId { get; set; }
} }

1
IRaCIS.Core.Application/Service/Management/UserService.cs
View File

@ -916,6 +916,7 @@ namespace IRaCIS.Core.Application.Service
var userLogQueryable = var userLogQueryable =
_userLogRepository.AsQueryable().IgnoreQueryFilters() _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))
.WhereIf(trialCreateTime != null, t => t.CreateTime >= trialCreateTime) .WhereIf(trialCreateTime != null, t => t.CreateTime >= trialCreateTime)
.WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType) .WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType)