From 02e418f6606c5eab5f8e943ac7fc1d5146f3a8f3 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 20 Jan 2025 15:17:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A6=E5=8F=B7=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml       | 4 ++--
 IRaCIS.Core.Application/Service/Management/UserService.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 689f44716..5cc51e341 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -12977,9 +12977,9 @@
             <param name="trialId"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TrialService.DeleteFolder">
+        <member name="M:IRaCIS.Core.Application.Service.TrialService.DeleteOSSFolder">
             <summary>
-            删除脏文件夹
+            删除OSS脏文件夹
             </summary>
             <returns></returns>
         </member>
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index 1bb5791e2..4e75d2cb8 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -923,7 +923,7 @@ namespace IRaCIS.Core.Application.Service
 
             var userLogQueryable =
                _userLogRepository.AsQueryable().IgnoreQueryFilters()
-                .WhereIf(inQuery.IdentityUserId != null, t => t.ActionIdentityUserId == inQuery.IdentityUserId)
+                .WhereIf(inQuery.IdentityUserId != null, t => t.ActionIdentityUserId == inQuery.IdentityUserId || t.TargetIdentityUserId == inQuery.IdentityUserId)
                .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)