From 6f0c98304659e01f6c1a29734cd152b52961dba4 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Thu, 15 Aug 2024 09:24:14 +0800
Subject: [PATCH] =?UTF-8?q?fix(88615):=20=E6=A0=87=E5=87=86=E6=8B=86?=
 =?UTF-8?q?=E5=88=86--=E7=BC=96=E8=BE=91--=E5=AF=BC=E5=87=BA=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=89=93=E4=B8=8D=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FileSplitItemsEOServiceImpl.java   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index 0a5059ce..8ef94218 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -4087,13 +4087,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         }
         try{
             //创建临时文件夹
-            String fileNowPath = uploadpath + "/tempZip/" + UUID.randomUUID().toString().replace("-","") + File.separator + fileOriName;
+            String tempPath = "";
+            if (fileOriName.length() > 10){
+                int index = fileOriName.lastIndexOf(".");
+                tempPath = fileOriName.substring(0, 50) + fileOriName.substring(index);
+            }
+//            String fileNowPath = uploadpath + "/tempZip/" + UUID.randomUUID().toString().replace("-","") + File.separator + fileOriName;
+            String fileNowPath = uploadpath + "/tempZip/" + UUID.randomUUID().toString().replace("-","") + File.separator + tempPath;
             File nowFile = new File(fileNowPath);
             if (nowFile.exists()){
                 nowFile.delete();
             }
             nowFile.mkdirs();
-            String fileName = fileOriName.replace(".zip", "") + ".xls";
+//            String fileName = fileOriName.replace(".zip", "") + ".xls";
+            String fileName = tempPath.replace(".zip", "") + ".xls";
             // 设置表格相关属性
             HSSFSheet sheetItems = workbook.createSheet("条文内容");
             String[] headers = getWorkbookTitleForExport(cut); // 获取表头
@@ -4362,7 +4369,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             String repFileName = fileName.replaceAll("/","_");
             excelOS = new FileOutputStream(fileNowPath + File.separator + repFileName);
             response.setHeader("Content-Disposition",
-                    "attachment; filename=\""+ ReadExcel.encodeFileName(fileOriName+".zip", request)  +"\"");
+                    "attachment; filename=\""+ ReadExcel.encodeFileName(tempPath+".zip", request)  +"\"");
             response.setContentType("application/force-download");
             response.flushBuffer();
             os = response.getOutputStream();