From 62371baf7317efade4908cdb310de9e8ec8d00de Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 24 Mar 2020 18:31:41 +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 +-
 .../mappers/TransactionAnalysisMapper.xml        | 16 ++++++++--------
 .../manage/mappers/system/ClientMapper.xml       |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index d42d12543..f4ca9a6f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.9</version>
+    <version>1.4.10</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 1735082c6..38aa9f338 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,13 +1116,13 @@
         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!=0 and industry!=1">
+        <if test="industry != null and industry=='1'">
+            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+'%'"/>
             AND c.royalpayindustry like #{industry}
         </if>
-        <if test="industry != null and industry==1">
-            AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
-        </if>
         and so.date >= #{from}
         and so.date &lt; #{to}
         and so.client_id!=0
@@ -1147,13 +1147,13 @@
         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!=0 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'.toString() and industry!='1'.toString()">
             <bind name="industry" value="industry+'%'"/>
             AND c.royalpayindustry like #{industry}
         </if>
-        <if test="industry != null and industry==1">
-            AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
-        </if>
         and so.date= #{transDate}
         and so.client_id!=0
         <if test="bd_user!=null">
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 6812d0dbb..b754e2870 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,13 +89,13 @@
             <if test="business_structure!=null">
                 AND c.business_structure=#{business_structure}
             </if>
-            <if test="industry!=null and industry != 0 and industry 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'.toString() and industry and industry!='1'.toString()">
                 <bind name="industry" value="industry+'%'"/>
                 AND c.royalpayindustry like #{industry}
             </if>
-            <if test="industry != null and industry==1">
-                AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
-            </if>
             <if test="create_start_time!=null">
                 AND c.create_time >= #{create_start_time}
             </if>