Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master

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())