Merge remote-tracking branch 'origin/dev_ic_data' into release_temp

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

@@ -34,7 +34,7 @@ public class ResiEventResearchAnalysisFormDTO implements Serializable {
     /**
      * 个人档案的这个人
      */
-    @NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class)
+    @NotBlank(message = "icResiUserId不能为空",groups = AddUserInternalGroup.class)
     private String icResiUserId;
 
     /**

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

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