diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 792a5bd59..a560d8afa 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -95,6 +95,7 @@ namespace IRaCIS.Core.Application.Service.Common RemoveTime = t.TrialUser.RemoveTime, //角色授权禁用时间 + RoleIsDeleted=t.IsDeleted, CreateTime = t.CreateTime, DeletedTime = t.DeletedTime, }).OrderBy(t => t.UserRealName) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs index bca7df395..68bbb5fae 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs @@ -100,6 +100,10 @@ namespace IRaCIS.Application.Contracts [DictionaryTranslateAttribute("IsUserExitTrial")] public bool IsDeleted { get; set; } + [DictionaryTranslateAttribute("IsSiteDisable")] + + public bool RoleIsDeleted { get; set; } + public DateTime? DeletedTime { get; set; }