diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index c27498a82b..45bbb65790 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -571,7 +571,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl pageUserPoint(IcResiPointPageFormDTO formDTO) { - if(StringUtils.isBlank(formDTO.getEpmetUserId())){ + if(org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){ return new PageData(new ArrayList<>(),NumConstant.ZERO); } PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index 8996007d8a..c6136f2202 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -52,7 +52,9 @@ USER_POINT_ACTION_LOG WHERE DEL_FLAG = '0' - AND USER_ID = #{epmetUserId} + + USER_ID = #{epmetUserId} + ORDER BY CREATED_TIME DESC 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 8d18c2a7ea..f4821b54b7 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 @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; @Data @@ -11,7 +12,7 @@ public class PageUserReportEventFormDTO implements Serializable { public interface AddUserInternalGroup { } //@NotBlank(message = "epmetUserId不能为空" , groups = AddUserInternalGroup.class) - private String epmetUserId; + private List epmetUserIdList; @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class) private Integer pageNo; @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class)