From 6d3caf3477f3c250768bd2aeb85fbfedaf92fe9f Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 3 Sep 2024 09:12:29 +0800 Subject: [PATCH] fix --- .../iformall/service/impl/WxEnergyServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 cb8d8ac99..0c6e0aa6c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -152,6 +152,12 @@ public class WxEnergyServiceImpl implements WxEnergyService { private FloorBuildingIdDTO getFloorBuildingIds(TenantEntity tenantEntity,List floorIds,List buildingIds) { //如果楼层是全选了的,则代表的是楼座。 + if (null == buildingIds || buildingIds.size() <= 0 ) { + FloorBuildingIdDTO dto = new FloorBuildingIdDTO(); + dto.setType(EnumEnergyMeterShopFloorType.FLOOR); + dto.setIds(floorIds); + return dto; + } //根据楼座id查询楼层 WxMallFloor fq = new WxMallFloor(); fq.updateTenantInfo(tenantEntity); @@ -184,11 +190,10 @@ public class WxEnergyServiceImpl implements WxEnergyService { } }else if (record.getPhysicsType() == EnumEnergyMeterPhysicsType.PUBLIC.getCode() || record.getPhysicsType() == EnumEnergyMeterPhysicsType.SUMMARY.getCode()) { List floorIds = record.getFloorIds(); - List buildindIds = record.getBuildingIds(); - if (null == floorIds || floorIds.size() <= 0 || null == buildindIds || buildindIds.size() <= 0 ) { + if (null == floorIds || floorIds.size() <= 0) { throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"必须选择楼层和楼座"); } - FloorBuildingIdDTO dto = getFloorBuildingIds(record, floorIds, buildindIds); + FloorBuildingIdDTO dto = getFloorBuildingIds(record, floorIds, record.getBuildingIds()); record.setType(dto.getType().getCode()); aliasIds = dto.getIds(); if (null == aliasIds || aliasIds.size() <= 0 ) {