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 23ec2b19ff..77f30363d4 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 @@ -141,21 +141,24 @@ public class PropertyManagementServiceImpl implements PropertyManagementService .set(IcPropertyManagementEntity::getUpdatedTime, new Date()) .set(IcPropertyManagementEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); icPropertyManagementDao.update(null, updateWrapper); + CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId()); + + // 查询当前物业,在本组织及下级范围内,管理的小区 + List originNeighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(formDTO.getId(), staffInfoCacheResult.getAgencyId()); + // 原来存在关联的小区,现在取消勾选了,需要删除物业小区关系表 + originNeighborHoodList.forEach(origin -> { + // 举例:原来管理A小区,现在取消勾选 + if (!formDTO.getNeighborHoodIdList().contains(origin.getId())) { + LambdaUpdateWrapper 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); + } + }); if (CollectionUtils.isNotEmpty(formDTO.getNeighborHoodIdList())) { - CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId()); - List originNeighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(formDTO.getId(),staffInfoCacheResult.getAgencyId()); - //原来关联的,现在清除的小区,删除物业小区关系表 - originNeighborHoodList.forEach(origin->{ - if(!formDTO.getNeighborHoodIdList().contains(origin.getId())){ - LambdaUpdateWrapper 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 queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, formDTO.getId()) @@ -167,6 +170,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService neighborHoodPropertyEntity.setNeighborHoodId(neighborHoodId); icNeighborHoodPropertyDao.insert(neighborHoodPropertyEntity); } + //原本已经存在小区和物业的关系,不用再插入 }); } }