From 0d445f7856a25a7f57c572eb3b4528609081f065 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 24 May 2022 15:57:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/IcEventController.java | 8 +++++---
 .../src/main/resources/mapper/IcEventDao.xml              | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
index 31edd65710..21117b94b0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
@@ -8,9 +8,11 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -393,9 +395,9 @@ public class IcEventController {
      * @Description  数字平台-事件导出
      **/
     @PostMapping("export")
-    public void export(@RequestBody IcEventListFormDTO formDTO, HttpServletResponse response) throws IOException {
-        formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
-        formDTO.setStaffId("d8dfc6c1fa2538976059f3900036d419");
+    public void export(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO, HttpServletResponse response) throws IOException {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
         formDTO.setIsPage(false);
         ExcelWriter excelWriter = null;
         formDTO.setPageSize(NumConstant.TEN_THOUSAND);
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index 1e5f89095c..6ae905f668 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
@@ -181,7 +181,7 @@
             AND ie.grid_id = #{gridId}
         </if>
         <if test="agencyId != null and agencyId != '' ">
-            AND ie.agency_id = #{agencyId}
+            AND ie.grid_pids LIKE CONCAT('%', #{agencyId}, '%')
         </if>
         <if test="sourceType != null and sourceType != '' ">
             AND ie.source_type = #{sourceType}