必须有组织才能去查询房屋

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[]{});
         }
 
-        // 查询房屋关联信息
+        if (result.getDeptId() != null && 0L != result.getDeptId()) {
-        EpidemicBuildingUnitDTO formDTO = new EpidemicBuildingUnitDTO();
+            // 查询房屋关联信息
-        formDTO.setIdCard(result.getIdCard());
+            EpidemicBuildingUnitDTO formDTO = new EpidemicBuildingUnitDTO();
-        formDTO.setGridId(result.getDeptId().toString());
+            formDTO.setIdCard(result.getIdCard());
-        EpidemicBuildingUnitDetailResultDTO unitInfo = epidemicBuildingUnitService.getUnitInfo(formDTO);
+            formDTO.setGridId(result.getDeptId().toString());
-        if (unitInfo != null) {
+            EpidemicBuildingUnitDetailResultDTO unitInfo = epidemicBuildingUnitService.getUnitInfo(formDTO);
-            result.setUnitId(unitInfo.getId());
+            if (unitInfo != null) {
-            result.setBuildingId(unitInfo.getBuildingId());
+                result.setUnitId(unitInfo.getId());
-            result.setPlotId(unitInfo.getPlotId());
+                result.setBuildingId(unitInfo.getBuildingId());
+                result.setPlotId(unitInfo.getPlotId());
+            }
         }
+
         return result;
     }