项目创建账户的时候,没有用户名,但是目标用户Id 有值,导致查询出来有名字
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
a49b4c8ef7
commit
68053d24b6
|
@ -1006,7 +1006,7 @@
|
||||||
</member>
|
</member>
|
||||||
<member name="M:IRaCIS.Core.Application.Service.InternationalizationService.BatchAddOrUpdateFrontInternationalization(System.Collections.Generic.List{IRaCIS.Core.Application.ViewModel.BatchInternationalizationDto})">
|
<member name="M:IRaCIS.Core.Application.Service.InternationalizationService.BatchAddOrUpdateFrontInternationalization(System.Collections.Generic.List{IRaCIS.Core.Application.ViewModel.BatchInternationalizationDto})">
|
||||||
<summary>
|
<summary>
|
||||||
前端批量提交,后端判断不存在就添加,存在就更新
|
前端批量提交,后端查询判断不存在就添加,存在就更新 (这里提交接口也能提交后端的标识,对后端标识进行更新)
|
||||||
</summary>
|
</summary>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
@ -8077,6 +8077,11 @@
|
||||||
任务类型
|
任务类型
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</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">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetRelatedVisitTaskOutDto.IsConvertedTask">
|
||||||
<summary>
|
<summary>
|
||||||
是否是转变的任务(转为IRECIST)
|
是否是转变的任务(转为IRECIST)
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
|
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
|
||||||
//--------------------------------------------------------------------
|
//--------------------------------------------------------------------
|
||||||
using IRaCIS.Core.Domain.Share;
|
using IRaCIS.Core.Domain.Share;
|
||||||
|
using Newtonsoft.Json;
|
||||||
namespace IRaCIS.Core.Application.ViewModel
|
namespace IRaCIS.Core.Application.ViewModel
|
||||||
{
|
{
|
||||||
/// <summary> UserLogView 列表视图模型 </summary>
|
/// <summary> UserLogView 列表视图模型 </summary>
|
||||||
|
@ -13,7 +14,7 @@ namespace IRaCIS.Core.Application.ViewModel
|
||||||
public string IP { get; set; }
|
public string IP { get; set; }
|
||||||
|
|
||||||
public string ActionUserType { get; set; }
|
public string ActionUserType { get; set; }
|
||||||
public int OptType { get; set; }
|
public UserOptType OptType { get; set; }
|
||||||
|
|
||||||
public string? ActionUserName { get; set; }
|
public string? ActionUserName { get; set; }
|
||||||
|
|
||||||
|
@ -26,10 +27,13 @@ namespace IRaCIS.Core.Application.ViewModel
|
||||||
|
|
||||||
public bool IsLoginUncommonly { get; set; }
|
public bool IsLoginUncommonly { get; set; }
|
||||||
|
|
||||||
|
|
||||||
public string JsonObj { get; set; }
|
public string JsonObj { get; set; }
|
||||||
|
|
||||||
public string IPRegion { get; set; }
|
public string IPRegion { get; set; }
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
|
public UserLogJsonObj UserObj => JsonObj.IsNotNullOrEmpty() ? JsonConvert.DeserializeObject<UserLogJsonObj>(JsonObj) :new UserLogJsonObj();
|
||||||
}
|
}
|
||||||
|
|
||||||
public class SendMfaCommand
|
public class SendMfaCommand
|
||||||
|
|
|
@ -963,6 +963,17 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
var pageList = await userLogQueryable.ToPagedListAsync(inQuery);
|
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;
|
return pageList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue