/heart/userdemand/mydemand入参改为icResiUserId

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接口返参中有此值

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