From ca4bc189cf614503877ae7189c23cfac5c49e202 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 7 Sep 2024 11:54:33 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/market/WxEnergyController.java | 2 +- .../src/main/java/com/iformall/domain/po/WxEnergyMeter.java | 2 ++ .../java/com/iformall/service/impl/WxEnergyServiceImpl.java | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index 7c41163b6..82925d823 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -330,7 +330,7 @@ public class WxEnergyController extends BaseController { @PostMapping("deleteChildMeter") public ResultData deleteChildMeter(@RequestBody WxEnergyMeter record) { record.updateTenantInfo(getTenantInfo()); - if (null == record.getParentMeterId()) { + if (null == record.getParentMeterId() || null == record.getChildMeterId()) { return new ResultData(Result.ERROR,"请选择一个关联"); } record.setTreeParentType("meter"); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java index f37d0c568..6dffd295b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java @@ -111,5 +111,7 @@ public class WxEnergyMeter extends TenantEntity { @TableField(exist = false) private Long parentMeterId; @TableField(exist = false) + private Long childMeterId; + @TableField(exist = false) private List notInIds; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index 75d64e41c..6fc48d355 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -263,20 +263,20 @@ public class WxEnergyServiceImpl implements WxEnergyService { sf.updateTenantInfo(record); sf.setType(EnumEnergyMeterShopFloorType.BUILDING.getCode()); sf.setAliseId(record.getTreeParentId()); - sf.setMeterId(record.getId()); + sf.setMeterId(record.getChildMeterId()); wxEnergyMeterShopFloorMapper.deleteByConditon(sf); }if (record.getTreeParentType().equals("floor")) { WxEnergyMeterShopFloor sf = new WxEnergyMeterShopFloor(); sf.updateTenantInfo(record); sf.setType(EnumEnergyMeterShopFloorType.FLOOR.getCode()); sf.setAliseId(record.getTreeParentId()); - sf.setMeterId(record.getId()); + sf.setMeterId(record.getChildMeterId()); wxEnergyMeterShopFloorMapper.deleteByConditon(sf); }if (record.getTreeParentType().equals("meter")) { WxEnergyMeterChild sf = new WxEnergyMeterChild(); sf.updateTenantInfo(record); sf.setParentMeterId(record.getTreeParentId()); - sf.setChildMeterId(record.getId()); + sf.setChildMeterId(record.getChildMeterId()); wxEnergyMeterChildMapper.deleteByCondition(sf); }