From 3c6dde7d66baf7cbecfac8484e7c5d72b6895e3a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 8 May 2023 17:43:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E4=B8=9A=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8B=BE=E9=80=89=E7=9A=84=E5=B0=8F=E5=8C=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E7=89=A9=E4=B8=9A=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PropertyManagementServiceImpl.java        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java
index 3c0f26de7f..16fdde6f25 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java
@@ -142,6 +142,20 @@ public class PropertyManagementServiceImpl implements PropertyManagementService
                 .set(IcPropertyManagementEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId());
         icPropertyManagementDao.update(null, updateWrapper);
         if (CollectionUtils.isNotEmpty(formDTO.getNeighborHoodIdList())) {
+            CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId());
+            List<IcNeighborHoodDTO> originNeighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(formDTO.getId(),staffInfoCacheResult.getAgencyId());
+            //原来关联的，现在清除的小区，删除物业小区关系表
+            originNeighborHoodList.forEach(origin->{
+                if(!formDTO.getNeighborHoodIdList().contains(origin.getId())){
+                    LambdaUpdateWrapper<IcNeighborHoodPropertyEntity> updateWrapper1=new LambdaUpdateWrapper<>();
+                    updateWrapper1.eq(IcNeighborHoodPropertyEntity::getPropertyId,formDTO.getId())
+                            .eq(IcNeighborHoodPropertyEntity::getNeighborHoodId,origin.getId())
+                            .set(IcNeighborHoodPropertyEntity::getDelFlag,NumConstant.ONE_STR)
+                            .set(IcNeighborHoodPropertyEntity::getUpdatedTime, new Date())
+                            .set(IcNeighborHoodPropertyEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId());
+                    icNeighborHoodPropertyDao.update(null,updateWrapper1);
+                }
+            });
             formDTO.getNeighborHoodIdList().forEach(neighborHoodId -> {
                 LambdaQueryWrapper<IcNeighborHoodPropertyEntity> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, formDTO.getId())