This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user