From 9db7571049e5e4aeec112a2eb7327b5536c3ae6e Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 7 Nov 2019 16:24:23 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9B=86=E5=9B=A2=E7=89=88][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:=E6=8B=9B=E5=95=86=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/mapper/WxRentContractMapper.java | 3 ++- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index 6d2eac394..8301785c2 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -62,7 +62,8 @@ public interface WxRentContractMapper extends CommonMapper List selectRentContractByShopIds(@Param("shopIds") Collection shopIds, @Param("shopIdsRegexp") String shopIdsRegexp, - @Param("tenantId") String tenantId); + @Param("tenantId") String tenantId, + @Param("subTenantId") String subTenantId); int hasContractNumber(WxRentContract wxRentContract); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 277375b51..388e8ab4c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2499,7 +2499,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public Map selectRentContractByShopIds(Collection shopIds, String shopIdsRegexp, TenantEntity tenantEntity) { - List list = wxRentContractMapper.selectRentContractByShopIds(shopIds, shopIdsRegexp, tenantEntity.getTenantId()); + List list = wxRentContractMapper.selectRentContractByShopIds(shopIds, shopIdsRegexp, tenantEntity.getTenantId(), tenantEntity.getSubTenantId()); List shopIdArr = Arrays.asList(StringUtils.split(shopIdsRegexp,"|")) ; Map allShopContract = new HashMap<>(); for (WxRentContract wxRentContract : list) {