From 98d1a63b76e6361c6c86a9a2b891a52951972b16 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 20 Oct 2022 13:29:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=8E=E6=96=87=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/epmetuser/impl/EpmetUserServiceImpl.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 5e731980d8..cff0f63234 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -997,10 +997,6 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         String customerId = tokenDto.getCustomerId();
         String userId = tokenDto.getUserId();
         CheckMQMsg msg = new CheckMQMsg();
-        IcResiUserInfoCache icResiUserInfo = CustomerResiUserRedis.getIcResiUserInfo(formDTO.getId());
-        if (null == icResiUserInfo){
-            throw new EpmetException("查询icResiUser失败："+formDTO.getId());
-        }
         if (formDTO.getType().equals(NeighborhoodConstant.HOUSE)){
             HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(customerId, formDTO.getId());
             if (null == houseInfo){
@@ -1010,10 +1006,18 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             result.setIdCard(houseInfo.getOwnerIdCard());
             msg.setContent("查看"+houseInfo.getAllName()+"房屋的敏感信息");
         }else if (formDTO.getType().equals(NeighborhoodConstant.IC_RESI_USER)){
+            IcResiUserInfoCache icResiUserInfo = CustomerResiUserRedis.getIcResiUserInfo(formDTO.getId());
+            if (null == icResiUserInfo){
+                throw new EpmetException("查询icResiUser失败："+formDTO.getId());
+            }
             result.setIdCard(icResiUserInfo.getIdCard());
             result.setMobile(icResiUserInfo.getMobile());
             msg.setContent("查看"+icResiUserInfo.getName()+"的敏感信息");
         }else if (formDTO.getType().equals(NeighborhoodConstant.JMFYXX)){
+            IcResiUserInfoCache icResiUserInfo = CustomerResiUserRedis.getIcResiUserInfo(formDTO.getId());
+            if (null == icResiUserInfo){
+                throw new EpmetException("查询icResiUser失败："+formDTO.getId());
+            }
             result.setIdCard(icResiUserInfo.getIdCard());
             result.setMobile(icResiUserInfo.getMobile());
             msg.setContent("查看"+icResiUserInfo.getName()+"的敏感信息(居民防疫信息)");