From 4955c6e78229e5baf781c3a834bd0fc70dfb9f3e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 17 Feb 2023 14:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=A0=E6=BA=90=E5=8A=A0=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcResiUserExportServiceImpl.java       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java
index a2d21ceed7..e0376d2c8b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java
@@ -7,8 +7,6 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.alibaba.fastjson.JSON;
-import com.epmet.commons.rocketmq.constants.TopicConstants;
-import com.epmet.commons.rocketmq.messages.CheckMQMsg;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -22,12 +20,18 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.*;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Md5Util;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.commons.tools.utils.poi.excel.handler.ExcelFillCellMergeStrategy;
 import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constant.IcResiUserConstant;
-import com.epmet.dto.form.*;
+import com.epmet.dto.form.ExportResiUserFormDTO;
+import com.epmet.dto.form.IcExportTemplateQueryFormDTO;
+import com.epmet.dto.form.IcResiUserPageFormDTO;
+import com.epmet.dto.form.ResiUserQueryValueDTO;
 import com.epmet.dto.result.FormItemResult;
 import com.epmet.dto.result.IcCustomExportResultDTO;
 import com.epmet.dto.result.OptionDTO;
@@ -50,10 +54,7 @@ import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
@@ -198,6 +199,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
                 List<IcCustomExportResultDTO.SqlColumn> showSqlColumns = exportConfigData.getShowSqlColumns();
                 Set<String> hiddenColumnSet = exportConfigData.getHiddenSqlColumns().stream().map(IcCustomExportResultDTO.SqlColumn::getColumnName).collect(Collectors.toSet());
                 result.forEach(o -> {
+                    log.info("!@#>>>>>>>>>>"+o.toString());
                     getDataForResi(itemOriginMap, staffInfoCacheResult, resultData, showSqlColumns, hiddenColumnSet, o);
                 });
                 log.info("!@#>>>>>>>>>>"+itemOriginMap.toString());
@@ -205,7 +207,6 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
                 log.info("!@#>>>>>>>>>>"+resultData.toString());
                 log.info("!@#>>>>>>>>>>"+showSqlColumns.toString());
                 log.info("!@#>>>>>>>>>>"+hiddenColumnSet.toString());
-                log.info("!@#>>>>>>>>>>"+o.toString());
                 if (!onlyGetData){
                     excelWriter.write(resultData, writeSheet);
                 }