diff --git a/ZR.Admin.WebApi/Controllers/BaseController.cs b/ZR.Admin.WebApi/Controllers/BaseController.cs
index 83454ac..fd7d9f8 100644
--- a/ZR.Admin.WebApi/Controllers/BaseController.cs
+++ b/ZR.Admin.WebApi/Controllers/BaseController.cs
@@ -112,6 +112,13 @@ namespace ZR.Admin.WebApi.Controllers
///
///
protected string ExportExcel(List list, string sheetName, string fileName)
+ {
+ var fileInfo = ExportExcelNew(list, sheetName, fileName);
+
+ return fileInfo.Item1;
+ }
+
+ protected (string, string) ExportExcelNew(List list, string sheetName, string fileName)
{
IWebHostEnvironment webHostEnvironment = (IWebHostEnvironment)App.ServiceProvider.GetService(typeof(IWebHostEnvironment));
string sFileName = $"{fileName}{DateTime.Now:MMddHHmmss}.xlsx";
@@ -130,7 +137,7 @@ namespace ZR.Admin.WebApi.Controllers
package.Save();
}
- return sFileName;
+ return (sFileName, newFileName);
}
///