From 94a7a7bf78e0aaaec5dda825db6c0ac6aa58f2b5 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 28 Aug 2019 14:46:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/log/UserDataRuleAspect.java | 2 +- mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 4 ++-- .../src/main/resources/mapper/WxMerchantTradeDailyMapper.xml | 4 ++-- .../src/main/resources/mapper/WxPropertyContractMapper.xml | 4 ++-- .../src/main/resources/mapper/WxRentContractMapper.xml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java b/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java index 879e90bed..f7c889c7a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java +++ b/mallinkAdmin/src/main/java/com/iformall/log/UserDataRuleAspect.java @@ -62,7 +62,7 @@ public class UserDataRuleAspect { buildingFloor = StringUtils.join(data, ","); } - String businessForRule = byUserId.getBusinessForRule(); + String businessForRule = byUserId.getBusiness(); if (StringUtils.isNotEmpty(businessForRule)) { Object[] data = JSONArray.parseArray(businessForRule).toArray(); businessForRule = StringUtils.join(data, ","); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 5cdc3d524..681406ce5 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -238,10 +238,10 @@ inner join wx_merchant m on ms.merchant_id = m.id inner join wx_shop s on s.id=ms.shop_id where m.tenant_id=#{tenantId} and s.is_del=0 - + and m.business_id in (${businessForRule}) - + and s.`floor` in (${floorForRule}) ) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml index 157d7c007..f91af3e34 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml @@ -150,10 +150,10 @@ inner join wx_merchant m on ms.merchant_id = m.id inner join wx_shop s on s.id=ms.shop_id where m.tenant_id=#{tenantId} and s.is_del=0 - + and m.business_id in (${businessForRule}) - + and s.`floor` in (${floorForRule}) ) diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 17fa3c140..8dec54644 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -149,10 +149,10 @@ inner join wx_merchant m on ms.merchant_id = m.id inner join wx_shop s on s.id=ms.shop_id where m.tenant_id=#{tenantId} and s.is_del=0 - + and m.business_id in (${businessForRule}) - + and s.`floor` in (${floorForRule}) ) diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 42321f244..7dc079828 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -177,10 +177,10 @@ inner join wx_merchant m on ms.merchant_id = m.id inner join wx_shop s on s.id=ms.shop_id where m.tenant_id=#{tenantId} and s.is_del=0 - + and m.business_id in (${businessForRule}) - + and s.`floor` in (${floorForRule}) )