From d1db921fa3e914578f1eb39616d3515c88573875 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 17 Jun 2022 10:14:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java     | 2 +-
 .../epidemic/service/impl/EpidemicUserInfoServiceImpl.java  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java
index 40f37cc..8c34507 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java
@@ -297,7 +297,7 @@ public class EpidemicReportUserInfoDTO implements Serializable {
 //    @Excel(name = "房屋地址")
     private String houseAddress;
 
-    private String unitId;
+    private Long unitId;
 
 
 }
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 9a9d690..111017f 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
@@ -224,7 +224,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Result updateNew(EpidemicReportUserInfoDTO dto) {
-        if (StringUtils.isNotBlank(dto.getUnitId())) {
+        if (dto.getUnitId() != null && dto.getUnitId() != NumConstant.ZERO) {
             saveHouseRelation(dto);
         }
         //基础信息dto
@@ -334,7 +334,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Result saveNew(EpidemicReportUserInfoDTO dto) {
-        if (StringUtils.isNotBlank(dto.getUnitId())) {
+        if (dto.getUnitId() != null && dto.getUnitId() != NumConstant.ZERO) {
             saveHouseRelation(dto);
         }
 
@@ -1717,6 +1717,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         EpidemicUnitOwnerEntity epidemicUnitOwnerEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUnitOwnerEntity.class);
         epidemicUnitOwnerEntity.setOwnerName(formDTO.getUserName());
         epidemicUnitOwnerEntity.setAddress(formDTO.getHouseAddress());
+        epidemicUnitOwnerService.deletePhysicalByIdCardAndUnitId(formDTO.getIdCard(), formDTO.getUnitId());
         epidemicUnitOwnerService.insert(epidemicUnitOwnerEntity);
 
         return new Result();
@@ -1727,6 +1728,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         EpidemicUnitOwnerEntity epidemicUnitOwnerEntity = ConvertUtils.sourceToTarget(dto, EpidemicUnitOwnerEntity.class);
         epidemicUnitOwnerEntity.setOwnerName(dto.getUserName());
         epidemicUnitOwnerEntity.setAddress(dto.getHouseAddress());
+        epidemicUnitOwnerService.deletePhysicalByIdCardAndUnitId(dto.getIdCard(), dto.getUnitId());
         epidemicUnitOwnerService.insert(epidemicUnitOwnerEntity);
     }