From e18ea027e2ab8efaa857dd4e8f3f971cdf53e50b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 8 Dec 2021 14:07:28 +0800
Subject: [PATCH] =?UTF-8?q?/heart/userdemand/mydemand=E5=85=A5=E5=8F=82?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAicResiUserId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java    | 4 ++--
 .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java    | 2 +-
 2 files changed, 3 insertions(+), 3 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 f29e088293..4589bbd9ed 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
@@ -16,8 +16,8 @@ public class IcResiUserDemandFromDTO implements Serializable {
     /**
      * 居民信息录入的居民的id
      */
-    @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class)
-    private String userId;
+    @NotBlank(message = "icResiUserId不能为空", groups = AddUserInternalGroup.class)
+    private String icResiUserId;
 
     /**
      * icresiuser/persondata接口返参中有此值
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 3a0f278b10..9f37c99a6a 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
@@ -476,7 +476,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         formDTO.setEpmetUserId(userRes.getData().getEpmetUserId());*/
         //icresiuser/persondata接口已经返回去epmetUserId，这里就不需要再查询了。直接让前端传过来
         List<String> userIds=new ArrayList<>();
-        userIds.add(formDTO.getUserId());
+        userIds.add(formDTO.getIcResiUserId());
         if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){
             userIds.addAll(formDTO.getEpmetUserIdList());
         }