Merge remote-tracking branch 'remotes/origin/dev_epidemic_situation' into dev

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");