diff --git a/pom.xml b/pom.xml index f4ca9a6f8..dad4a61cb 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.4.10 + 1.4.11 UTF-8 1.8.0 diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml index 38aa9f338..0485158ff 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml @@ -1116,11 +1116,11 @@ statistics_customer_order so inner JOIN sys_clients c ON so.client_id = c.client_id AND c.is_valid = 1 - + AND (c.royalpayindustry =1 or c.royalpayindustry like '100%') - - + + AND c.royalpayindustry like #{industry} and so.date >= #{from} diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml index b754e2870..f6ccf6d31 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml @@ -89,10 +89,10 @@ AND c.business_structure=#{business_structure} - + AND (c.royalpayindustry =1 or c.royalpayindustry like '100%') - + AND c.royalpayindustry like #{industry}