From de0215b8230dd7565e7abc2f67a650b625e7c014 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 24 Mar 2020 18:16:49 +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 +-
 .../analysis/mappers/TransactionAnalysisMapper.xml     | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5173364fa..d42d12543 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.8</version>
+    <version>1.4.9</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 3506f47a6..1735082c6 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,10 +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">
+        <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
@@ -1144,10 +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">
+        <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= #{transDate}
         and so.client_id!=0
         <if test="bd_user!=null">