From 98947b0609a3e6c03d343ac1f8eb1f272eeaec4d Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 13 Nov 2024 16:27:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FileDocProcess/ExcelExportHelper.cs       | 52 +++++++++++--------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs b/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs
index 0435c3dc6..65aabea98 100644
--- a/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs
+++ b/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs
@@ -165,7 +165,7 @@ public static class ExcelExportHelper
             }
 
             //中文替换项目术语
-            if (isEn_US == false && data.TrialObjectNameList.Count > 0)
+            if (data.TrialObjectNameList.Count > 0)
             {
                 var replaceObjectList = data.TrialObjectNameList;
 
@@ -176,24 +176,30 @@ public static class ExcelExportHelper
                 for (int rowIndex = 0; rowIndex < rowCount; rowIndex++)
                 {
                     var row = sheet.GetRow(rowIndex);
-                    var colums = row.LastCellNum;
 
-                    for (int colIndex = 0; colIndex < colums; colIndex++)
+                    if (row != null)
                     {
-                        var cell = row.GetCell(colIndex);
 
-                        // 只处理字符串类型的单元格
-                        if (cell != null)
+                        var colums = row.LastCellNum;
+
+                        for (int colIndex = 0; colIndex < colums; colIndex++)
                         {
-                            var cellValue = cell.StringCellValue;
+                            var cell = row.GetCell(colIndex);
 
-                            var find = replaceObjectList.FirstOrDefault(t => t.Name == cellValue);
-                            if (find != null)
+                            // 只处理字符串类型的单元格
+                            if (cell != null)
                             {
-                                cell.SetCellValue(find.TrialName);
+                                var cellValue = cell.StringCellValue;
+
+                                var find = replaceObjectList.FirstOrDefault(t => t.Name == cellValue);
+                                if (find != null)
+                                {
+                                    cell.SetCellValue(find.TrialName);
+                                }
                             }
                         }
                     }
+
                 }
             }
 
@@ -415,7 +421,7 @@ public static class ExcelExportHelper
             }
 
             //中文替换项目术语
-            if (isEn_US == false && data.TrialObjectNameList.Count > 0)
+            if (data.TrialObjectNameList.Count > 0)
             {
                 var replaceObjectList = data.TrialObjectNameList;
 
@@ -426,21 +432,25 @@ public static class ExcelExportHelper
                 for (int rowIndex = 0; rowIndex < rowCount; rowIndex++)
                 {
                     var row = sheet.GetRow(rowIndex);
-                    var colums = row.LastCellNum;
-
-                    for (int colIndex = 0; colIndex < colums; colIndex++)
+                    if (row != null)
                     {
-                        var cell = row.GetCell(colIndex);
 
-                        // 只处理字符串类型的单元格
-                        if (cell != null)
+                        var colums = row.LastCellNum;
+
+                        for (int colIndex = 0; colIndex < colums; colIndex++)
                         {
-                            var cellValue = cell.StringCellValue;
+                            var cell = row.GetCell(colIndex);
 
-                            var find = replaceObjectList.FirstOrDefault(t => t.Name == cellValue);
-                            if (find != null)
+                            // 只处理字符串类型的单元格
+                            if (cell != null)
                             {
-                                cell.SetCellValue(find.TrialName);
+                                var cellValue = cell.StringCellValue;
+
+                                var find = replaceObjectList.FirstOrDefault(t => t.Name == cellValue);
+                                if (find != null)
+                                {
+                                    cell.SetCellValue(find.TrialName);
+                                }
                             }
                         }
                     }