diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 8921e36..0854e9c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -177,18 +177,21 @@ dtoMap.put(wellDto.getWellId(),wellDto); } + //移除不再关联的关系 + for (DeviceWell deviceWell : deviceWells) { + if(!dtoMap.containsKey(deviceWell.getWellId())){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEVICE_ID",deviceWell.getDeviceId()); +// query.eq("WELL_ID",deviceWell.getWellId()); + deviceWellService.delete(query); + } + } //添加新增闸井关系 for (DeviceWellDto wellDto : wellDtos) { if(!maps.containsKey(wellDto.getWellId())){ deviceWellService.insert(createDeviceWell(entity.getId(), wellDto.getWellId())); } } - //移除不再关联的关系 - for (DeviceWell deviceWell : deviceWells) { - if(!dtoMap.containsKey(deviceWell.getWellId())){ - deviceWellService.deleteById(entity.getId()); - } - } }