From 659ab716192991c264eccec4163081776087e747 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 14 Dec 2020 16:08:24 +0800 Subject: [PATCH 1/2] bug --- .../resources/mapper/WxMerchantMapper.xml | 35 +++++-------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 5ad51c895..b4926c8f3 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -197,38 +197,21 @@ and status in(2,3,4)) r on m.id=r.merchant_id + order by ${sortColumns} @@ -272,11 +255,11 @@ and m.`img_url` like concat('%', #{imgUrl},'%') - + and m.`name` like concat('%', #{name},'%') - + and m.`link_phone` like concat('%', #{linkPhone},'%') @@ -362,7 +345,7 @@ - order by ${sortColumns} + From 02827c559bfcdc3ac463c9237aba51b48baae8f9 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 14 Dec 2020 16:38:11 +0800 Subject: [PATCH 2/2] bug --- .../mapper/WxPropertyContractMapper.xml | 25 ++++++++++++++++ .../resources/mapper/WxRentContractMapper.xml | 30 +++++++++++++++++-- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 41635e9f7..6c93cfe1d 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -98,6 +98,31 @@ and `end_date` = #{endDate} and `rent_shop_type` = #{rentShopType} and `operation_type` = #{operationType} + + + and business_id in (${businessForRule}) + + + and `id` in + + select id from wx_property_contract where 1=1 + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + and json_unquote(json_extract(json_extract(rent_info,'$[*].shopId'),concat('$[',#{idx},']'))) in(select + id from wx_shop where 1=1 + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + and floor in (${floorForRule})) + + and id in diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 8850737ac..5ba324d17 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -135,6 +135,32 @@ and shop_name like concat('%',#{shopNumber},'%') + + + and business_id in (${businessForRule}) + + + and `id` in + + select id from wx_rent_contract where 1=1 + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + and json_unquote(json_extract(json_extract(rent_info,'$[*].shopId'),concat('$[',#{idx},']'))) in(select + id from wx_shop where 1=1 + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + and floor in (${floorForRule})) + + + and status in @@ -588,7 +614,7 @@ and rc.business_id in (${businessForRule}) - +