From 5307167a37ca1f7226b5159933c3f913bd9cf854 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 24 Mar 2020 18:50:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=95=86=E6=88=B7=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                     | 2 +-
 .../manage/analysis/mappers/TransactionAnalysisMapper.xml   | 6 +++---
 .../royalpay/payment/manage/mappers/system/ClientMapper.xml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index f4ca9a6f8..dad4a61cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.10</version>
+    <version>1.4.11</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
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
-        <if test="industry != null and industry=='1'">
+        <if test="industry != null and industry=='1'.toString()">
             AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
         </if>
-        <if test="industry != null and industry!='0' and industry!='1'">
-            <bind name="industry" value="industry+'%'"/>
+        <if test="industry != null and industry!='0'.toString() and industry!='1'">
+            <bind name="industry" value="industry +'%'"/>
             AND c.royalpayindustry like #{industry}
         </if>
         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 @@
             <if test="business_structure!=null">
                 AND c.business_structure=#{business_structure}
             </if>
-            <if test="industry != null and industry=='1'.toString()">
+            <if test="industry != null and industry == '1'.toString()">
                 AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
             </if>
-            <if test="industry!=null and industry != '0'.toString() and industry and industry!='1'.toString()">
+            <if test="industry!=null and industry != '0'.toString() and industry and industry!='1'">
                 <bind name="industry" value="industry+'%'"/>
                 AND c.royalpayindustry like #{industry}
             </if>