From ce9d095c6a3da729aa8b6be6e7c11cb8a034a3e3 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 30 Jun 2022 17:58:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=85=E9=A1=BB=E6=9C=89=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=89=8D=E8=83=BD=E5=8E=BB=E6=9F=A5=E8=AF=A2=E6=88=BF=E5=B1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EpidemicUserInfoServiceImpl.java     | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
index 2052662..2ef6ad6 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
@@ -205,16 +205,19 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             result.setDestinationAddressCodes(new String[]{});
         }
 
-        // 查询房屋关联信息
-        EpidemicBuildingUnitDTO formDTO = new EpidemicBuildingUnitDTO();
-        formDTO.setIdCard(result.getIdCard());
-        formDTO.setGridId(result.getDeptId().toString());
-        EpidemicBuildingUnitDetailResultDTO unitInfo = epidemicBuildingUnitService.getUnitInfo(formDTO);
-        if (unitInfo != null) {
-            result.setUnitId(unitInfo.getId());
-            result.setBuildingId(unitInfo.getBuildingId());
-            result.setPlotId(unitInfo.getPlotId());
+        if (result.getDeptId() != null && 0L != result.getDeptId()) {
+            // 查询房屋关联信息
+            EpidemicBuildingUnitDTO formDTO = new EpidemicBuildingUnitDTO();
+            formDTO.setIdCard(result.getIdCard());
+            formDTO.setGridId(result.getDeptId().toString());
+            EpidemicBuildingUnitDetailResultDTO unitInfo = epidemicBuildingUnitService.getUnitInfo(formDTO);
+            if (unitInfo != null) {
+                result.setUnitId(unitInfo.getId());
+                result.setBuildingId(unitInfo.getBuildingId());
+                result.setPlotId(unitInfo.getPlotId());
+            }
         }
+
         return result;
     }