From 2b21b0324ef849d3847cb693a270a585e2e5fd4e Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 23 Jun 2022 15:46:09 +0800
Subject: [PATCH] bug

---
 .../service/impl/EpidemicBuildingUnitServiceImpl.java | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
index faeb065..b5913db 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
@@ -775,7 +775,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
                     if (StringUtils.isNotBlank(item.getIdCard())) {
                         EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
                         entity.setIdCard(item.getIdCard());
-                        entity.setUnitId(unitOptional.get().getUnitId());
+                        entity.setUnitId(unitEntity.getId());
                         entity.setOwnerName(item.getUserName());
                         entity.setMobile(item.getMobile());
                         addOwner.add(entity);
@@ -799,13 +799,6 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
                         addOwner.add(entity);
                     }
 
-                    EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
-                    entity.setIdCard(item.getIdCard());
-                    entity.setUnitId(unitOptional.get().getUnitId());
-                    entity.setOwnerName(item.getUserName());
-                    entity.setMobile(item.getMobile());
-
-                    addOwner.add(entity);
                 } else {
                     Optional<EpidemicPlotBuildingResultDTO> buildingOptional = buildingList.stream().filter(build -> build.getPlotName().equals(item.getPlot()) && build.getBuildingName().equals(item.getBuildingNo())).findFirst();
                     if (buildingOptional.isPresent()) {
@@ -848,7 +841,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
                         if (StringUtils.isNotBlank(item.getIdCard())) {
                             EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
                             entity.setIdCard(item.getIdCard());
-                            entity.setUnitId(unitOptional.get().getUnitId());
+                            entity.setUnitId(unitEntity.getId());
                             entity.setOwnerName(item.getUserName());
                             entity.setMobile(item.getMobile());
                             epidemicUnitOwnerService.deleteByIdCard(item.getIdCard());