影响上传导出

IRaCIS.Core.Application/Helper/ExcelExportHelper.cs

@@ -3,6 +3,7 @@ using IRaCIS.Core.Application.Helper;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using MiniExcelLibs;
+using MiniExcelLibs.OpenXml;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -25,10 +26,10 @@ public static class ExcelExportHelper
 
             //字典表查询出所有需要翻译的数据
 
-            var translateDataList = await  _dictionaryService.GetBasicDataSelect(needTranslatePropertyList.Select(t => t.DicParentCode).ToArray());
+            var translateDataList = await  _dictionaryService.GetBasicDataSelect(needTranslatePropertyList.Select(t => t.DicParentCode).Distinct().ToArray());
 
 
-            var dic = JsonConvert.DeserializeObject<IDictionary<string, object>>(data.ToJsonStr());
+            var dic = JsonConvert.DeserializeObject<IDictionary<string, object>>(data.ToJsonNotIgnoreNull());
 
             foreach (var key in dic.Keys)
             {
@@ -41,7 +42,7 @@ public static class ExcelExportHelper
 
                     foreach (var item in dic[key] as JArray)
                     {
-                        var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonStr());
+                        var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
 
 
                         foreach (var needTranslateProperty in needTranslatePropertyList)
@@ -80,7 +81,12 @@ public static class ExcelExportHelper
 
         var memoryStream = new MemoryStream();
 
-        await MiniExcel.SaveAsByTemplateAsync(memoryStream, tplPath, data);
+        var config = new OpenXmlConfiguration()
+        {
+            IgnoreTemplateParameterMissing = true,
+        };
+
+        await MiniExcel.SaveAsByTemplateAsync(memoryStream, tplPath, data, config);
 
         memoryStream.Seek(0, SeekOrigin.Begin);