From 223a756a7bb17fcb8021d584c5e33b7b6b878b5a Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 17 Oct 2024 22:08:26 +0800 Subject: [PATCH] fix --- .../controller/WxMallAdminController.java | 30 ++++++++++++------- .../domain/po/WxEnergyMeterShopFloor.java | 4 +++ 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java index 9b4683b53..a7c57b807 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java @@ -390,10 +390,15 @@ public class WxMallAdminController extends BaseController { return new ResultData(); } setQueryDataRule(record); - if (StringUtils.isNotBlank(record.getSearchKey())) { + + if (StringUtils.isNotBlank(record.getSearchKey()) || null != record.getBuilding() || null != record.getFloor() ) { WxShop sq = new WxShop(); sq.updateTenantInfo(record); - sq.setShopNumber(record.getSearchKey()); + sq.setBuilding(record.getBuilding()); + sq.setFloor(record.getFloor()); + if (StringUtils.isNotBlank(record.getSearchKey())) { + sq.setShopNumber(record.getSearchKey()); + } List sids = wxShopService.getShopIds(sq); if (null != sids && sids.size() > 0 ) { record.setType(EnumEnergyMeterShopFloorType.SHOP.getCode()); @@ -403,15 +408,18 @@ public class WxMallAdminController extends BaseController { record.setMeterIds(mids); } } - WxEnergyMeter mq = new WxEnergyMeter(); - mq.updateTenantInfo(record); - mq.setName(record.getSearchKey()); - List mids1 = wxEnergyService.getMeterIdList(mq); - if (null != mids1 && mids1.size() > 0 ) { - if (null == record.getMeterIds()) { - record.setMeterIds(new ArrayList()); - } - record.getMeterIds().addAll(mids1); + + if (StringUtils.isNotBlank(record.getSearchKey())) { + WxEnergyMeter mq = new WxEnergyMeter(); + mq.updateTenantInfo(record); + mq.setName(record.getSearchKey()); + List mids1 = wxEnergyService.getMeterIdList(mq); + if (null != mids1 && mids1.size() > 0 ) { + if (null == record.getMeterIds()) { + record.setMeterIds(new ArrayList()); + } + record.getMeterIds().addAll(mids1); + } } } record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterShopFloor.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterShopFloor.java index e60627af4..d387de1e5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterShopFloor.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterShopFloor.java @@ -70,5 +70,9 @@ public class WxEnergyMeterShopFloor extends TenantEntity { private String searchKey; @TableField(exist = false) private List meterIds; + @TableField(exist = false) + private Long building; + @TableField(exist = false) + private Long floor; }