fix 合并

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/poi/ExcelUtil.java

@@ -350,15 +350,13 @@ public class ExcelUtil<T>
         try
         {
             Workbook workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.HSSF);
-            String filename = encodingFilename(sheetName);
+            String filename = encodingXLSFilename(sheetName);
             out = new FileOutputStream(getAbsoluteFile(filename));
             workbook.write(out);
             return AjaxResult.success(filename);
         }
         catch (Exception e)
         {
-            System.out.println("3434");
-            System.out.println(e.getMessage());
             log.error("导出Excel异常{}", e.getMessage());
             throw new CustomException("导出Excel失败，请联系网站管理员！");
         }
@@ -932,6 +930,12 @@ public class ExcelUtil<T>
     /**
      * 编码文件名
      */
+    public String encodingXLSFilename(String filename)
+    {
+        filename = UUID.randomUUID().toString() + "_" + filename + ".xls";
+        return filename;
+    }
+
     public String encodingFilename(String filename)
     {
         filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";