From 3dc5507b6b3de45386c07a03fa2251540af7f46e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 13 Jan 2025 13:08:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E4=B8=8E=E4=BA=BA=E5=91=98=E5=AF=BC?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/Common/ExcelExportService.cs  | 1 +
 .../Service/TrialSiteUser/DTO/UserTrialViewModel.cs           | 4 ++++
 2 files changed, 5 insertions(+)

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; }