diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java index 2cf9a8221..6d744a394 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java @@ -34,7 +34,7 @@ public interface WxPropertyContractMapper extends CommonMapper getRentContractList(String tenantId); + List getRentContractList(Map params); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index b0c5d3dc4..c731e6fad 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -355,8 +355,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override public Object getRentContractList(String tenantId) { - - return wxPropertyContractMapper.getRentContractList(tenantId); + Map params =new HashMap<>(); + params.put("tenantId",tenantId); + return wxPropertyContractMapper.getRentContractList(params); } public Map updateStatus(String tenantId) { diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 8f0f0202d..b9f157202 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -144,10 +144,10 @@ )s) and merchant_id is null and tenant_id=#{tenantId} - select rc.*,s.shop_number from wx_rent_contract rc left join wx_shop s on rc.shop_id=s.id where rc.status not in(1,6,7) and rc.tenant_id=#{tenantId} - and rc.id not in (select pc.rent_contract_id form ( + and rc.id not in (select pc.rent_contract_id from ( select rent_contract_id from wx_property_contract where status not in(1,6,7) and tenant_id=#{tenantId} ) pc)