From 68053d24b67da7a1ab827407223209ef25f8be13 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 19 Feb 2025 14:20:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA=E8=B4=A6?=
 =?UTF-8?q?=E6=88=B7=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=EF=BC=8C=E4=BD=86=E6=98=AF=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E7=94=A8=E6=88=B7Id=20=E6=9C=89=E5=80=BC=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=9F=A5=E8=AF=A2=E5=87=BA=E6=9D=A5=E6=9C=89?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml   |  7 ++++++-
 .../Service/Management/DTO/UserLogViewModel.cs        |  8 ++++++--
 .../Service/Management/UserService.cs                 | 11 +++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index b8034d5ff..ab5932cc5 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1006,7 +1006,7 @@
         </member>
         <member name="M:IRaCIS.Core.Application.Service.InternationalizationService.BatchAddOrUpdateFrontInternationalization(System.Collections.Generic.List{IRaCIS.Core.Application.ViewModel.BatchInternationalizationDto})">
             <summary>
-            前端批量提交，后端判断不存在就添加，存在就更新
+            前端批量提交，后端查询判断不存在就添加，存在就更新   （这里提交接口也能提交后端的标识，对后端标识进行更新）
             </summary>
             <returns></returns>
         </member>
@@ -8077,6 +8077,11 @@
             任务类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetRelatedVisitTaskOutDto.IsExistUnprocessedFeedback">
+            <summary>
+            是否存在未处理的反馈
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetRelatedVisitTaskOutDto.IsConvertedTask">
             <summary>
             是否是转变的任务(转为IRECIST)
diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
index 0a019d707..5ff702acd 100644
--- a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
@@ -4,6 +4,7 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 using IRaCIS.Core.Domain.Share;
+using Newtonsoft.Json;
 namespace IRaCIS.Core.Application.ViewModel
 {
     /// <summary> UserLogView  列表视图模型 </summary>
@@ -13,7 +14,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public string IP { get; set; }
 
         public string ActionUserType { get; set; }
-        public int OptType { get; set; }
+        public UserOptType OptType { get; set; }
 
         public string? ActionUserName { get; set; }
 
@@ -26,10 +27,13 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public bool IsLoginUncommonly { get; set; }
 
-        
+
         public string JsonObj { get; set; }
 
         public string IPRegion { get; set; }
+
+        [JsonIgnore]
+        public UserLogJsonObj UserObj => JsonObj.IsNotNullOrEmpty() ? JsonConvert.DeserializeObject<UserLogJsonObj>(JsonObj) :new UserLogJsonObj();
     }
 
     public class SendMfaCommand
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index cc0c9e42f..f4742e88c 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -963,6 +963,17 @@ namespace IRaCIS.Core.Application.Service
 
             var pageList = await userLogQueryable.ToPagedListAsync(inQuery);
 
+
+            //项目创建账户的时候，没有用户名，但是目标用户Id 有值，导致查询出来有名字，所以在此单独处理下
+
+            foreach (var item in pageList.CurrentPageData)
+            {
+                if (item.OptType == UserOptType.AddUser)
+                {
+                    item.TargetIdentityUserName = item.UserObj.UserName;
+                }
+            }
+
             return pageList;
         }