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 @@ - 前端批量提交,后端判断不存在就添加,存在就更新 + 前端批量提交,后端查询判断不存在就添加,存在就更新 (这里提交接口也能提交后端的标识,对后端标识进行更新) @@ -8077,6 +8077,11 @@ 任务类型 + + + 是否存在未处理的反馈 + + 是否是转变的任务(转为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 { /// UserLogView 列表视图模型 @@ -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(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; }