is->ic

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java

@@ -24,7 +24,7 @@ public class DemandResearchAnalysisFormDTO implements Serializable {
     private String firstCategoryCode;
 
     @NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class)
-    private String isResiUserId;
+    private String icResiUserId;
 
     private List<String> epmetUserIdList;
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -565,7 +565,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
     @Override
     public DemandResearchAnalysisResultDTO queryDemandResearchAnalysis(DemandResearchAnalysisFormDTO formDTO) {
         //获取案件居民和及家属列表
-        Result<IcResiUserBriefDTO> userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIsResiUserId());
+        Result<IcResiUserBriefDTO> userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId());
         if (userRes.success() || null == userRes.getData()) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息及技术接口异常");
         }
@@ -574,7 +574,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         resultDTO.setEpmetUserIdList(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList()) ? formDTO.getEpmetUserIdList() : Collections.emptyList());
         //获取当前需求人，相同分类的需求列表。不分页，直接返回所有
         List<String> userIds=new ArrayList<>();
-        userIds.add(formDTO.getIsResiUserId());
+        userIds.add(formDTO.getIcResiUserId());
         if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){
             userIds.addAll(formDTO.getEpmetUserIdList());
         }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java

@@ -35,7 +35,7 @@ public class ResiEventResearchAnalysisFormDTO implements Serializable {
      * 个人档案的这个人
      */
     @NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class)
-    private String isResiUserId;
+    private String icResiUserId;
 
     /**
      * 个人档案的这个人，对应小程序的人的用户id

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -683,7 +683,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     @Override
     public ResiEventResearchAnalysisResDTO queryResiEventResearchAnalysis(ResiEventResearchAnalysisFormDTO formDTO) {
         //获取案件居民和及家属列表
-        Result<IcResiUserBriefDTO> userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIsResiUserId());
+        Result<IcResiUserBriefDTO> userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId());
         if (userRes.success() || null == userRes.getData()) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息及技术接口异常");
         }