From 11b057244d72f3d541f38d06997a3b66ca6eaf68 Mon Sep 17 00:00:00 2001
From: lixuetao <lixuetao@syxysoft.com>
Date: Thu, 31 Mar 2022 11:50:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BussDocumentLibraryEOServiceImpl.java | 18 +++++++++++++-----
 .../src/views/documentManage/library/index.vue |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 13ce257db..aec69fe3f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -2923,7 +2923,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
     public void exportTemplate(Map<String, Object> map, HttpServletResponse response, HttpServletRequest request) {
         OutputStream os = null;
         HSSFWorkbook workbook = new HSSFWorkbook();
-        String fileOriName = "导入模板";
+        String fileOriName = "文档库导入模板.xls";
         String filePath = uploadpath + File.separator + fileOriName;
         try {
             List<String> list = getWorkbookTitle((String) map.get("cut"));
@@ -2933,7 +2933,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 nowFile.delete();
             }
             nowFile.mkdirs();
-            String fileName = "导入模板.xls";
             HSSFSheet sheet = workbook.createSheet("文档库导入模板");
             sheet.setDefaultColumnWidth(16);//列宽
             HSSFCellStyle cellStyle = workbook.createCellStyle();
@@ -2967,7 +2966,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
             }
             response.setHeader("Content-Disposition",
-                    "attachment; filename=\"" + fileOriName + ".xlsx");
+                    "attachment; filename=\"" + fileOriName + ".xls");
             response.setContentType("application/force-download");
             response.flushBuffer();
             os = response.getOutputStream();
@@ -3419,7 +3418,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 }
                 // 校验头部是否符合模板
                 String fields = list.get(0);
-                String substring = headerSb.substring(0, headerSb.length() - 1);
+
+                //判断结尾为逗号，则减1个字符
+                String substring = headerSb.toString();
+                if (substring.endsWith(",") || substring.endsWith("，")){
+                    substring = headerSb.substring(0, headerSb.length() - 1);
+                }
+
                 String excelHeader = substring.toString();
                 if (!fields.equals(excelHeader)) {
                     workbook.close();
@@ -3722,7 +3727,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 }
                             }
                             if (ObjectUtils.isNotEmpty(sb)) {
-                                String substring = sb.substring(0, sb.length() - 1);
+                                String substring = sb.toString();
+                                if (substring.endsWith(",") || substring.endsWith("，")){
+                                    substring = substring.substring(0, substring.length() - 1);
+                                }
                                 value = substring;
                             }
                         }
diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue
index cf2ba8c49..5bda5e60b 100644
--- a/jero-web/src/views/documentManage/library/index.vue
+++ b/jero-web/src/views/documentManage/library/index.vue
@@ -162,7 +162,7 @@
       },
       //下载模板
       handleModule() {
-        downloadFile('document/bussDocumentLibraryEO/exportTemplate', '文档库.xls', {})
+        downloadFile('document/bussDocumentLibraryEO/exportTemplate', '文档库导入模板.xls', {})
       },
       //批量删除
       handleDel() {