From 71cde179c50c700d15e291ea5a1eb0d34d7625bf Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 20 Apr 2024 17:23:25 +0800 Subject: [PATCH] fix bug --- .../datatower/WxMerchantTradeDailyController.java | 7 ++++++- .../service/impl/WxMerchantTradeDailyServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index b9b7ad5ff..b7724c632 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -9,6 +9,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMerchantTradeDaily; import com.iformall.domain.po.WxMerchantTradeDailyHistory; +import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.domain.vo.WxMerchantTradeDailyVo; @@ -48,7 +49,11 @@ public class WxMerchantTradeDailyController extends BaseController { if (wxMerchantTradeDaily == null) wxMerchantTradeDaily = new WxMerchantTradeDaily(); wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); - + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); + wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); + } wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.CreateDate_DESC); PageInfo page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index fde185ac5..8ae9b90dd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -185,7 +185,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ private void handleQueryParam(WxMerchantTradeDaily record) { //楼层楼座 - List floorMids = wxMerchantService.getFloorBuildMerchantIds(record, null, record.getBuildingId(), record.getFloorId(), EnumYesOrNo.NO.getCode(), EnumYesOrNo.NO.getCode()); + List floorMids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuildingId(), record.getFloorId(), EnumYesOrNo.NO.getCode(), EnumYesOrNo.NO.getCode()); if (null != floorMids || StringUtils.isNotBlank(record.getMerchantName())) { WxMerchant m = new WxMerchant(); m.updateTenantInfo(record);