From a97d0fb1ceb8520fbcbdcacaf9483a0c548853e0 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Tue, 7 Sep 2021 15:43:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/common/aspect/ExportAspect.java      | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java b/common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java
index 8bcf3198..761a0370 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java
@@ -1,22 +1,17 @@
 package com.foreverwin.mesnac.common.aspect;
 
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.foreverwin.mesnac.common.export.ColumnConvert;
-import com.foreverwin.mesnac.common.export.DateConvert;
 import com.foreverwin.mesnac.common.model.ExportTemplate;
 import com.foreverwin.mesnac.common.service.ExportTemplateService;
-import com.foreverwin.mesnac.common.util.DateUtil;
 import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.SpringUtil;
-import org.apache.commons.lang.time.DateFormatUtils;
-import org.apache.commons.lang.time.DateUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -32,7 +27,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Aspect
@@ -55,7 +49,7 @@ public class ExportAspect {
         String exportCode = "";
         //-------------------------------------------------------------------------------------------------------------------
         if (paramtes == null || args == null || args.length == 0) return joinPoint.proceed();
-        Boolean isDuoDuo = (args != null && args.length == 1) ? false : true;
+        Boolean isDuoDuo = (args != null && (args.length == 1 && args[0].getClass() != String.class)) ? false : true;
         //-------------------------------------------------------------------------------------------------------------------
         request.setCharacterEncoding("UTF-8");
         //-------------------------------------------------------------------------------------------------------------------
@@ -73,9 +67,12 @@ public class ExportAspect {
             while (paramtes.hasMoreElements()) {
                 String param = paramtes.nextElement();
                 String value = request.getParameter(param);
-                if (param != null && param.equals("export")) export = true;
-                if (param != null && param.equals("exportCode")) exportCode = value;
-
+                if (param != null && param.equals("export")) {
+                    export = true;
+                }
+                if (param != null && param.equals("exportCode")) {
+                    exportCode = value;
+                }
                 paramMap.put(param, value);
             }//while
             args[0] = paramMap;