From 9f48bc819724d073725a2451617a2030c24666ab Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 14 Oct 2022 14:24:22 +0800
Subject: [PATCH] =?UTF-8?q?/gov/project/icEvent/myreport-detail=E4=B8=8D?=
 =?UTF-8?q?=E9=99=90=E5=88=B6userId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/IcEventController.java   | 2 +-
 .../java/com/epmet/service/impl/IcEventServiceImpl.java     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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 a139371cb2..c7bd63814f 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
@@ -413,7 +413,7 @@ public class IcEventController {
     @PostMapping("myreport-detail")
     public Result<MyReportIcEvResDTO> myReportDetail(@LoginUser TokenDto tokenDto, @RequestBody MyReportIcEvFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
-        formDTO.setUserId(tokenDto.getUserId());
+        // formDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO, MyReportIcEvFormDTO.DetailGroup.class);
         return new Result<MyReportIcEvResDTO>().ok(icEventService.myReportDetail(formDTO));
     }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index 3fba9bf715..b37344a620 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@@ -1682,7 +1682,13 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
     @Override
     public MyReportIcEvResDTO myReportDetail(MyReportIcEvFormDTO formDTO) {
         // 1.分页查询
+        // <if test="userId != null and userId != '' ">
+        //         AND ie.REPORT_USER_ID = #{userId}
+        //     </if>
         List<MyReportIcEvResDTO> list=baseDao.selectMyReport(formDTO);
+        if(CollectionUtils.isEmpty(list)){
+            return null;
+        }
         if (!CollectionUtils.isEmpty(list)) {
             //封装数据
             for (MyReportIcEvResDTO dto : list) {