From c856d4647b5a9de928aeaee5eebb50fa3e16e717 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 26 Jul 2022 17:33:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=A1=A3=E6=A1=88=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E4=BB=B6=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/PageUserReportEventFormDTO.java | 4 +++- .../com/epmet/service/impl/IcEventServiceImpl.java | 12 +++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java index 0a7b966a62..457a2c8550 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java @@ -2,6 +2,7 @@ package com.epmet.dto.form; import lombok.Data; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; @@ -19,5 +20,6 @@ public class PageUserReportEventFormDTO implements Serializable { private Integer pageNo; @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class) private Integer pageSize; - + @NotBlank(message = "userId不能为空" , groups = AddUserInternalGroup.class) + private String userId; } 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 7dfdc190be..1f20ff0a39 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 @@ -1612,9 +1612,15 @@ public class IcEventServiceImpl extends BaseServiceImpl icEventPageUserReported(PageUserReportEventFormDTO formDTO) { - if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) { - return new PageData(new ArrayList<>(), NumConstant.ZERO); - } + // if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) { + // return new PageData(new ArrayList<>(), NumConstant.ZERO); + // } + List epmetUserIdList=new ArrayList<>(); + epmetUserIdList.add(formDTO.getUserId()); + if(!CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){ + epmetUserIdList.addAll(formDTO.getEpmetUserIdList()); + } + formDTO.setEpmetUserIdList(epmetUserIdList); PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserReported(formDTO)); return new PageData<>(pageInfo.getList(), pageInfo.getTotal());