From 31f9d2e3604934bf6325d54cbc79f35e009e4441 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 8 Dec 2021 12:14:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E5=8F=82epmetUserIdList?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/UserPointActionLogServiceImpl.java | 2 +-
 .../src/main/resources/mapper/UserPointActionLogDao.xml       | 4 +++-
 .../java/com/epmet/dto/form/PageUserReportEventFormDTO.java   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

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<UserPointActi
      */
     @Override
     public PageData<ResiPointPageResDTO> pageUserPoint(IcResiPointPageFormDTO formDTO) {
-        if(StringUtils.isBlank(formDTO.getEpmetUserId())){
+        if(org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){
             return new PageData<ResiPointPageResDTO>(new ArrayList<>(),NumConstant.ZERO);
         }
         PageInfo<ResiPointPageResDTO> 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}
+        <foreach item="epmetUserId" collection="epmetUserIdList" open="AND (" separator="or" close=")" index="">
+            USER_ID = #{epmetUserId}
+        </foreach>
         ORDER BY
             CREATED_TIME DESC
     </select>
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<String> epmetUserIdList;
     @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class)
     private Integer pageNo;
     @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class)