From c0d91bb45bf17f0492e1bb904640d453ce893f5f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Dec 2021 22:39:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90-=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E6=A1=A3=E6=A1=88-=E4=BA=8B=E4=BB=B6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=A0=94=E5=88=A4=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java    | 2 +-
 .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java
index 9cb4a525d2..c20612d279 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java
+++ b/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;
 
     /**
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 129ebda49b..c37f16b292 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/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();