From d9c81f6af5dfb72db48fcde71b56d88551e5fca1 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 8 Dec 2021 11:15:13 +0800
Subject: [PATCH] =?UTF-8?q?"mydemand"=E5=85=A5=E5=8F=82=E5=A2=9E=E5=8A=A0e?=
 =?UTF-8?q?pmetUserIdList?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/demand/IcResiUserDemandFromDTO.java     |  7 ++++++-
 .../service/impl/IcUserDemandRecServiceImpl.java     |  6 +++++-
 .../src/main/resources/mapper/IcUserDemandRecDao.xml | 12 ++++--------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java
index 51d334d874..f29e088293 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java
@@ -5,6 +5,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class IcResiUserDemandFromDTO implements Serializable {
@@ -21,7 +22,7 @@ public class IcResiUserDemandFromDTO implements Serializable {
     /**
      * icresiuser/persondata接口返参中有此值
      */
-    private String epmetUserId;
+    private List<String> epmetUserIdList;
 
     @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class)
     private Integer pageNo;
@@ -36,4 +37,8 @@ public class IcResiUserDemandFromDTO implements Serializable {
     @NotBlank(message = "tokenDto获取客户id不能为空", groups = AddUserInternalGroup.class)
     private String customerId;
 
+    /**
+     * epmetUserIdList+userId
+     */
+    private List<String> userIds;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index 0693b7ec7b..3a0f278b10 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -475,7 +475,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         }
         formDTO.setEpmetUserId(userRes.getData().getEpmetUserId());*/
         //icresiuser/persondata接口已经返回去epmetUserId，这里就不需要再查询了。直接让前端传过来
-
+        List<String> userIds=new ArrayList<>();
+        userIds.add(formDTO.getUserId());
+        if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){
+            userIds.addAll(formDTO.getEpmetUserIdList());
+        }
         //2、小程序内自己上报+赋能平台待录入的
         PageInfo<IcResiUserReportDemandRes> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserDemand(formDTO));
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
index 8aed916dee..33d491e2b4 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
@@ -134,14 +134,10 @@
             ic_user_demand_rec r
         WHERE
             r.DEL_FLAG = '0'
-            <choose>
-                <when test="null!=epmetUserId and epmetUserId!='' ">
-                    AND (r.DEMAND_USER_ID = #{userId} or r.DEMAND_USER_ID=#{epmetUserId})
-                </when>
-                <otherwise>
-                    AND r.DEMAND_USER_ID = #{userId}
-                </otherwise>
-            </choose>
+            AND r.DEMAND_USER_ID in
+            <foreach item="demandUserId" collection="userIds" open="(" separator="," close=")">
+                #{demandUserId}
+            </foreach>
             <if test="null !=firstCategoryCode and firstCategoryCode!=''">
                 and r.CATEGORY_CODE like concat(#{firstCategoryCode},'%')
             </if>