/gov/project/icEvent/myreport-detail不限制userId

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));
     }

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) {