From 42ab61d0a287c5e1f30cbb09a3324363d0ba003d Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 25 Oct 2024 17:03:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=A1=A8=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/QC/DTO/QCListViewModel.cs                    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
index 4290f27ef..729cbdbe4 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
@@ -292,8 +292,7 @@ namespace IRaCIS.Core.Application.Contracts
         public string LatestReplyUserName { get; set; } = String.Empty;
 
         public string Content { get; set; } = string.Empty;
-
-        public string ContentReplaced => Content.Replace("<br>","").Replace("<div style='margin-left:20px'>", "").Replace("</div>","");
+        public string ContentReplaced => Content.Replace("<br>","").Replace("<br/>", "").Replace("<div style='margin-left:20px'>", "").Replace("</div>","");
 
         [DictionaryTranslateAttribute("ChallengeIsClosed")]
         public bool IsClosed { get; set; }
@@ -352,6 +351,8 @@ namespace IRaCIS.Core.Application.Contracts
         public string UserName { get; set; }
 
         public string Content { get; set; }
+
+        public string ContentReplaced => Content.Replace("<br>", "").Replace("<br>", "").Replace("<br/>", "").Replace("<div style='text-indent: 20px;'>", "").Replace("</div>", "");
     }
 
 
@@ -726,10 +727,10 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string CheckResult { get; set; } = String.Empty;
 
-        public string CheckResultReplaced => CheckResult.Replace("<br>", "").Replace("<div style='text-indent: 20px;'>", "").Replace("</div>", "");
+        //public string CheckResultReplaced => CheckResult.Replace("<br>", "").Replace("<div style='text-indent: 20px;'>", "").Replace("</div>", "");
 
         public List<DialogInfo> CheckDialogList { get; set; }
-        public string CheckDialogStr => string.Join("\n\n", CheckDialogList.OrderBy(t => t.CreateTime).Select(c => c.UserName + " (" + ExportExcelConverterDate.DateTimeInternationalToString(c.CreateTime) + ") :" + c.Content));
+        public string CheckDialogStr => string.Join("\n\n", CheckDialogList.OrderBy(t => t.CreateTime).Select(c => c.UserName + " (" + ExportExcelConverterDate.DateTimeInternationalToString(c.CreateTime) + ") :" + c.ContentReplaced));
 
         public DateTime? CheckBackTime { get; set; }