From d65770ad5dc3edf4ef5aa17b77a547091929bbd4 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 20 Apr 2024 15:53:17 +0800 Subject: [PATCH] fix bug --- .../controller/basic/WxShopController.java | 14 +++++++++++--- .../src/main/resources/mapper/WxShopMapper.xml | 5 +++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index ca1a77435..c7c1c386f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -7,6 +7,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxShop; +import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxShopService; import io.swagger.annotations.ApiImplicitParam; @@ -179,12 +180,16 @@ public class WxShopController extends BaseController { @GetMapping("/exportNotRentShop") @SystemControllerLog(description = "商铺出租数据-未出租商铺列表-导出") public void exportNotRentShop(@ModelAttribute WxShop wxShop, HttpServletRequest request, HttpServletResponse response) { - logger.debug("[" + getIpAddr() + "] WxShopController::exportNotRentShop"); if (null == wxShop){ wxShop = new WxShop(); } wxShop.updateTenantInfo(getTenantInfo()); wxShop.setSortColumns(BaseEntity.SortField.SCreateDate_DESC,BaseEntity.SortField.SId_DESC); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxShop.setFloorForRule(dataRule.getFloorIds()); + wxShop.setBusinessForRule(dataRule.getBussinessIds()); + } wxShopService.exportNotRentShop(wxShop, request, response); } @@ -194,7 +199,6 @@ public class WxShopController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "未出租商铺分页列表接口") public ResultData notRentShopList(@ModelAttribute WxShop wxShop, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxShopController::notRentShopList"); if (null == wxShop){ @@ -202,7 +206,11 @@ public class WxShopController extends BaseController { } wxShop.updateTenantInfo(getTenantInfo()); wxShop.setSortColumns(BaseEntity.SortField.SCreateDate_DESC,BaseEntity.SortField.SId_DESC); - + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxShop.setFloorForRule(dataRule.getFloorIds()); + wxShop.setBusinessForRule(dataRule.getBussinessIds()); + } final PageInfo> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 22179880f..8ceaab5ec 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -317,6 +317,11 @@ and s.`point_type` = #{pointType} + + + and s.`floor` in (${floorForRule}) + + order by ${sortColumn} ${sortOrder}