个人档案上报事件接口调整

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

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<IcEventDao, IcEventEntit
 
     @Override
     public PageData<PageUserReportEventResDTO> icEventPageUserReported(PageUserReportEventFormDTO formDTO) {
-        if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) {
-            return new PageData<PageUserReportEventResDTO>(new ArrayList<>(), NumConstant.ZERO);
-        }
+        // if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) {
+        //     return new PageData<PageUserReportEventResDTO>(new ArrayList<>(), NumConstant.ZERO);
+        // }
+        List<String> epmetUserIdList=new ArrayList<>();
+        epmetUserIdList.add(formDTO.getUserId());
+        if(!CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){
+            epmetUserIdList.addAll(formDTO.getEpmetUserIdList());
+        }
+        formDTO.setEpmetUserIdList(epmetUserIdList);
         PageInfo<PageUserReportEventResDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserReported(formDTO));
         return new PageData<>(pageInfo.getList(), pageInfo.getTotal());