From 6594e67d486b28d07d592edfa6960292456ff2df Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 16 Sep 2022 09:32:18 +0800
Subject: [PATCH] try

---
 .../java/com/epmet/controller/IcResiUserController.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index c25d1ff604..fb6a0c9f69 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -584,9 +584,9 @@ public class IcResiUserController implements ResultDataResolver {
     @RequestMapping(value = "/exportExcelCustomData")
     public Map<String, Object> exportExcelCustomData(@LoginUser TokenDto tokenDto, @RequestParam("templateId") String templateId,
                                                      @RequestBody ExportResiUserFormDTO pageFormDTO) throws Exception {
-        log.warn("templateId=【"+templateId+"】");
         log.warn("pageFormDTO入参【"+JSON.toJSONString(pageFormDTO)+"】");
-        pageFormDTO.setTemplateId(templateId);
+        // pageFormDTO.setTemplateId(templateId);
+        pageFormDTO.setTemplateId(tokenDto.getCustomerId().concat("_").concat(templateId));
         if (null == pageFormDTO.getSearchForm()) {
             IcResiUserPageFormDTO searchForm = new IcResiUserPageFormDTO();
             searchForm.setFormCode("resi_base_info");
@@ -613,7 +613,8 @@ public class IcResiUserController implements ResultDataResolver {
             pageFormDTO.setExportConfig(exportTemplateSaveFormDTO);
         }
         //固定通用客户Id
-        pageFormDTO.setCustomerId("jmreport_resi_default");
+        // pageFormDTO.setCustomerId("jmreport_resi_default");
+        pageFormDTO.setCustomerId(tokenDto.getCustomerId());
         Page<Map<String, Object>> maps = icResiUserExportService.exportIcResiUser(tokenDto, pageFormDTO, null, true);
         Map<String,Object> result = new HashMap<>();
         result.put("total",maps.getPages());