From 670f5ba7d1115997350451968826131caa2b98d6 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 11 Apr 2022 14:47:41 +0800
Subject: [PATCH] mingzi bug

---
 .../src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
index 378ea5a725..bd5c5597c0 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java
@@ -86,7 +86,7 @@ public class ExcelUtils {
 
     public static ServletOutputStream getOutputStreamForExcel(String fileName, HttpServletResponse response) throws IOException {
         fileName = URLEncoder.encode(fileName, "UTF-8");
-        if (!fileName.endsWith(".xls") ||!fileName.endsWith(".xlsx")){
+        if (!fileName.endsWith(".xls") && !fileName.endsWith(".xlsx")){
             fileName = fileName + ".xlsx";
         }
         response.setContentType("application/vnd.ms-excel");