From 50321ef85ccb99d095deb68ed82f6d9918fac241 Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Wed, 10 Jan 2018 11:22:46 +0800
Subject: [PATCH 1/3] fix

---
 .../core/impls/ClientManagerImpl.java         |  4 ++-
 .../analysis/mappers/BDAnalysisMapper.xml     |  9 +++++--
 .../mappers/ClientRatesAnalysisMapper.xml     | 12 ++++++---
 .../analysis/mappers/OrderAnalysisMapper.xml  |  8 ++++--
 .../mappers/TransactionAnalysisMapper.xml     | 25 ++++++++++++++-----
 .../mappers/log/ClearingDetailMapper.xml      |  4 ++-
 .../ActPartnerWechatRelationMapper.xml        |  4 ++-
 .../mappers/system/ClientDeviceMapper.xml     |  4 ++-
 .../mappers/system/ClientLocationsMapper.xml  |  4 ++-
 .../manage/mappers/system/ClientMapper.xml    |  6 +++--
 .../manage/mappers/system/ManagerMapper.xml   | 12 ++++++---
 .../manage/mappers/system/OrgMapper.xml       |  3 ---
 12 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index a0051133a..fa4c94bf1 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -214,7 +214,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (client == null) {
             throw new InvalidShortIdException();
         }
-        checkClientOrg(manager, client);
+        if (manager!=null){
+            checkClientOrg(manager, client);
+        }
         client.put("show_all_permission", true);
         int role = manager != null ? manager.getIntValue("role") : 0;
         if (manager != null) {
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
index 696d064cc..f5f83a564 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
@@ -19,9 +19,12 @@
         INNER JOIN sys_client_bd d ON temp.client_id = d.client_id AND d.start_date &lt;= temp.create_time and
         d.is_valid = '1'
         AND (d.end_date is null or d.end_date > temp.create_time)
-        <if test="org_id!=null">
+        <if test="org_id!=null and org_ids==null">
             INNER JOIN sys_managers m on m.manager_id = d.bd_id and m.org_id = #{org_id}
         </if>
+        <if test="org_ids!=null">
+            INNER JOIN sys_managers m on m.manager_id = d.bd_id and m.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         <if test="bd_group!=null">and temp.client_id in
             (SELECT b.client_id FROM sys_client_bd b
             INNER JOIN financial_bd_config c ON c.manager_id=b.bd_id
@@ -142,7 +145,9 @@
                 ON c.client_id = b.client_id AND b.start_date <= c.approve_time AND (b.end_date > c.approve_time OR b.end_date IS NULL)
         WHERE c.approve_time >= #{begin} AND c.approve_time < #{end} AND c.is_valid = 1 AND c.approve_result = 1
         ]]>
-        <if test="org_id!=null">and c.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and c.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and c.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         <if test="source==1">and c.source=1</if>
         <if test="source==2">and c.source!=1</if>
         group by bd_id
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientRatesAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientRatesAnalysisMapper.xml
index d61e7c716..6c4a23d6d 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientRatesAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientRatesAnalysisMapper.xml
@@ -42,7 +42,9 @@
                        ) c ON c.client_id = r.client_id
         ]]>
         <where>
-            <if test="org_id!=null">m.org_id=#{org_id}</if>
+            <if test="org_id!=null and org_ids==null">m.org_id=#{org_id}</if>
+            <if test="org_ids!=null">and m.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
             <if test="bd_group!=null">and m.manager_id in (select manager_id from financial_bd_config where (bd_group=#{bd_group} or manager_id=#{bd_group}))</if>
         </where>
         GROUP BY m.manager_id
@@ -78,7 +80,9 @@
         GROUP BY c.client_id
         ) c
         <where>
-            <if test="org_id!=null">c.org_id=#{org_id}</if>
+            <if test="org_id!=null and org_ids==null">c.org_id=#{org_id}</if>
+            <if test="org_ids!=null">and c.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
             <if test="bd_group!=null">and c.client_id in
                 (SELECT b.client_id FROM sys_client_bd b
                 INNER JOIN financial_bd_config c ON c.manager_id=b.bd_id
@@ -171,9 +175,11 @@
                 ]]>
             </if>
             and c.approve_result=1 and c.is_valid=1
-            <if test="org_id!=null">
+            <if test="org_id!=null and org_ids==null">
                 and c.org_id=#{org_id}
             </if>
+            <if test="org_ids!=null">and c.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         </where>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
index 81cd75173..5631ef67c 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
@@ -220,7 +220,9 @@
             <if test="customer_id!=null">
                 and o.customer_id=#{customer_id}
             </if>
-            <if test="org_id!=null">and o.org_id=#{org_id}</if>
+            <if test="org_id!=null and org_ids==null">and o.org_id=#{org_id}</if>
+            <if test="org_ids!=null">and o.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         </where>
         GROUP BY o.customer_id ORDER BY points desc
     </select>
@@ -248,7 +250,9 @@
             <if test="customer_id!=null">
                 and o.customer_id=#{customer_id}
             </if>
-            <if test="org_id!=null">and o.org_id=#{org_id}</if>
+            <if test="org_id!=null and org_ids==null">and o.org_id=#{org_id}</if>
+            <if test="org_ids!=null">and o.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         </where>
     </select>
 </mapper>
\ No newline at end of file
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 4a3f597ef..123b35337 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
@@ -52,7 +52,9 @@
         <if test="client_ids==null and client_id != null">
             and o.client_id=#{client_id}
         </if>
-        <if test="org_id!=null">and l.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and l.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and l.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
     </select>
 
     <select id="analysisTotalCount" resultType="java.lang.Double">
@@ -72,7 +74,10 @@
         <if test="client_ids==null and client_id != null">
             and o.client_id=#{client_id}
         </if>
-        <if test="org_id!=null">and l.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and l.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and l.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
+        </if>
     </select>
 
     <select id="analysisRefundAmount" resultType="java.lang.Double">
@@ -156,7 +161,9 @@
         <if test="client_ids==null and client_id != null">
             and o.client_id=#{client_id}
         </if>
-        <if test="org_id!=null">and o.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and o.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and o.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         <![CDATA[
         GROUP BY o.order_id
         ]]>
@@ -199,7 +206,9 @@
         <if test="client_id!=null">AND l.client_id = #{client_id}</if>
         <if test="begin!=null">and o.create_time &gt;= #{begin}</if>
         <if test="end!=null">and o.create_time &lt;= #{end}</if>
-        <if test="org_id!=null">and l.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and l.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and l.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         GROUP BY gateway_label
     </select>
     <select id="tradeAnalysisInHours" resultType="com.alibaba.fastjson.JSONObject">
@@ -226,7 +235,9 @@
         <if test="client_ids==null and client_id != null">
             and o.client_id=#{client_id}
         </if>
-        <if test="org_id!=null">and l.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and l.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and l.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         <if test="bd_group!=null">and l.client_id in
             (SELECT b.client_id FROM sys_client_bd b
             INNER JOIN financial_bd_config c ON c.manager_id=b.bd_id
@@ -260,7 +271,9 @@
         <if test="client_ids==null and client_id != null">
             and o.client_id=#{client_id}
         </if>
-        <if test="org_id!=null">and l.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and l.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and l.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         <![CDATA[
         GROUP BY date(o.create_time)
         ORDER BY date(o.create_time)
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/ClearingDetailMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/ClearingDetailMapper.xml
index cff0d191e..ef0029c88 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/ClearingDetailMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/ClearingDetailMapper.xml
@@ -50,9 +50,11 @@
             <if test="client_moniker!=null">
                 and c.client_moniker = #{client_moniker}
             </if>
-            <if test="org_id!=null">
+            <if test="org_id!=null and org_ids==null">
                 and c.org_id = #{org_id}
             </if>
+            <if test="org_ids!=null">and c.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         </where>
     </select>
 
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerWechatRelationMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerWechatRelationMapper.xml
index f0d4274da..9760ea20c 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerWechatRelationMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/redpack/ActPartnerWechatRelationMapper.xml
@@ -78,7 +78,9 @@
                     and c.remark like #{name_pattern}
                 </if>
             </if>
-            <if test="org_id!=null">and c.org_id=#{org_id}</if>
+            <if test="org_id!=null and org_ids==null">and c.org_id=#{org_id}</if>
+            <if test="org_ids!=null">and c.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
             and c.is_valid=1
         </where>
     </select>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.xml
index 446bfbaad..e3b828184 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.xml
@@ -41,9 +41,11 @@
             <if test="client_type!=null">
                 and d.client_type=#{client_type}
             </if>
-            <if test="org_id!=null">
+            <if test="org_id!=null and org_ids==null">
                 and c.org_id=#{org_id}
             </if>
+            <if test="org_ids!=null">and c.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         </where>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientLocationsMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientLocationsMapper.xml
index 556fcbcea..417c92e20 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientLocationsMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientLocationsMapper.xml
@@ -117,7 +117,9 @@
                     and c.remark like #{name_pattern}
                 </if>
             </if>
-            <if test="org_id!=null">and c.org_id=#{org_id}</if>
+            <if test="org_id!=null and org_ids==null">and c.org_id=#{org_id}</if>
+            <if test="org_ids!=null">and c.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
             <if test="referrer_id!=null">and c.referrer_id=#{referrer_id}</if>
             <if test="is_valid">and c.is_valid=1</if>
         </where>
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 59fce38fe..7995aa37b 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
@@ -149,7 +149,7 @@
                     and c.remark like #{name_pattern}
                 </if>
             </if>
-            <if test="org_id!=null">and c.org_id=#{org_id}</if>
+            <if test="org_id!=null and org_ids==null">and c.org_id=#{org_id}</if>
             <if test="org_ids!=null">and c.org_id in
                 <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
             <if test="referrer_id!=null">and c.referrer_id=#{referrer_id}</if>
@@ -191,7 +191,9 @@
                     and c.remark like #{name_pattern}
                 </if>
             </if>
-            <if test="org_id!=null">and c.org_id=#{org_id}</if>
+            <if test="org_id!=null and org_ids==null">and c.org_id=#{org_id}</if>
+            <if test="org_ids!=null">and c.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
             and c.is_valid=1
         </where>
         GROUP BY c.contact_email
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml
index 2ebe604e3..eda7ecae9 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml
@@ -8,7 +8,9 @@
         WHERE role & #{mask} >0 and m.is_valid=1
         AND o.type = 0
         ]]>
-        <if test="org_id!=null">and m.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and m.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
     </select>
     <select id="listAvailable" resultType="com.alibaba.fastjson.JSONObject">
         SELECT manager_id,
@@ -26,7 +28,9 @@
         ) o
         ON m.wx_openid = o.wechat_openid
         <where>
-            <if test="org_id!=null">m.org_id=#{org_id}</if>
+            <if test="org_id!=null and org_ids==null">m.org_id=#{org_id}</if>
+            <if test="org_ids!=null">m.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
             and m.is_valid=1
         </where>
     </select>
@@ -42,7 +46,9 @@
         SELECT m.* FROM sys_managers m
         WHERE role & #{mask} >0 and m.is_valid=1
         ]]>
-        <if test="org_id!=null">and m.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and m.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and m.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
     </select>
     <select id="listRoyalPayUsers" resultType="com.alibaba.fastjson.JSONObject">
         SELECT m.*
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/OrgMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/OrgMapper.xml
index c1a62ca1c..6502e0b17 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/OrgMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/OrgMapper.xml
@@ -64,9 +64,6 @@
             <if test="name!=null">
                 and org.name=#{name}
             </if>
-            <if test="parent_org_id!=null">
-                and org.parent_org_id=#{parent_org_id}
-            </if>
             <if test="org_id!=null">
             and (org.org_id=#{org_id} or org.parent_org_id=#{org_id})
         </if>

From e064d30a64ed49ce26bd844a10a2da334240cea3 Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Wed, 10 Jan 2018 12:02:07 +0800
Subject: [PATCH 2/3] fix

---
 .../mappers/TransactionAnalysisMapper.xml     | 36 ++++++++++++++-----
 .../manage/mappers/payment/OrderMapper.xml    | 14 ++++++--
 .../mappers/payment/TransactionMapper.xml     | 12 +++++--
 3 files changed, 47 insertions(+), 15 deletions(-)

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 123b35337..078381401 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
@@ -298,7 +298,9 @@
         <if test="client_ids==null and client_id != null">
             and o.client_id=#{client_id}
         </if>
-        <if test="org_id!=null">and l.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and l.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and l.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
     </select>
     <select id="countCustomers" resultType="java.lang.Integer">
         <![CDATA[
@@ -317,7 +319,9 @@
         <if test="client_ids==null and client_id != null">
             and o.client_id=#{client_id}
         </if>
-        <if test="org_id!=null">and o.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and o.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and o.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         <![CDATA[
         GROUP BY o.customer_id) p
          ]]>
@@ -340,7 +344,9 @@
         <if test="client_ids==null and client_id != null">
             and o.client_id=#{client_id}
         </if>
-        <if test="org_id!=null">and t.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and t.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and t.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         <if test="channel !=null"> and o.channel = #{channel}</if>
         <![CDATA[
         GROUP BY o.customer_id) p
@@ -379,7 +385,9 @@
         <if test="client_ids==null and client_id != null">
             and o.client_id=#{client_id}
         </if>
-        <if test="org_id!=null">and t.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and t.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and t.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         <if test="channel !=null"> and o.channel = #{channel}</if>
         <![CDATA[
         GROUP BY o.customer_id) p
@@ -444,7 +452,9 @@
         WHERE l.transaction_type = 'Credit'
               AND o.create_time >= #{begin} AND o.create_time <= #{end}
         ]]>
-        <if test="org_id!=null">and l.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and l.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and l.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         <if test="bd_group!=null">and l.client_id in
             (SELECT b.client_id FROM sys_client_bd b
             INNER JOIN financial_bd_config c ON c.manager_id=b.bd_id
@@ -491,7 +501,9 @@
         <if test="trade_type=='Share Code'">
             and o.gateway=11
         </if>
-        <if test="org_id!=null">and l.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and l.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and l.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         <if test="bd_group!=null">and l.client_id in
             (SELECT b.client_id FROM sys_client_bd b
             INNER JOIN financial_bd_config c ON c.manager_id=b.bd_id
@@ -571,7 +583,9 @@
         <if test="trade_type=='Share Code'">
             and o.gateway=11
         </if>
-        <if test="org_id!=null">and ptran.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and ptran.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and ptran.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
     </select>
     <select id="listExchangeRates" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
@@ -621,7 +635,9 @@
         <if test="client_ids==null and client_id != null">
             and o.client_id=#{client_id}
         </if>
-        <if test="org_id!=null">and o.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and o.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and o.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         GROUP BY date , channel  ORDER BY date DESC
     </select>
     <select id="getOrgTransactionAnalysis" resultType="com.alibaba.fastjson.JSONObject">
@@ -669,7 +685,9 @@
             and o.client_id=#{client_id}
         </if>
         <if test="channel!=null">and o.channel=#{channel}</if>
-        <if test="org_id!=null">and l.org_id=#{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and l.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and l.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
     </select>
 
     <select id="countAmountRangeAnalysis" resultType="java.lang.Integer">
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index 1fa582785..73509a46b 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -178,6 +178,8 @@
                 <foreach collection="trade_type" item="gateway" open="(" close=")" separator=",">#{gateway}</foreach>
             </if>
             <if test="org_id!=null and org_ids==null">and p.org_id=#{org_id}</if>
+            <if test="org_ids!=null">and p.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
             <if test="from!=null">and o.create_time &gt;= #{from}</if>
             <if test="to!=null">and o.create_time &lt; #{to}</if>
             <if test="date!=null">and date(o.create_time)=date(#{date})</if>
@@ -291,7 +293,9 @@
             <if test="trade_type!=null">and o.gateway in
                 <foreach collection="trade_type" item="gateway" open="(" close=")" separator=",">#{gateway}</foreach>
             </if>
-            <if test="org_id!=null">and p.org_id=#{org_id}</if>
+            <if test="org_id!=null and org_ids==null">and p.org_id=#{org_id}</if>
+            <if test="org_ids!=null">and p.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
             <if test="from!=null">and o.create_time &gt;= #{from}</if>
             <if test="to!=null">and o.create_time &lt; #{to}</if>
             <if test="date!=null">and date(o.create_time)=date(#{date})</if>
@@ -468,7 +472,9 @@
             </if>
             <if test="from!=null">and ocreate_time &gt;= #{from}</if>
             <if test="to!=null">and o.create_time &lt; #{to}</if>
-            <if test="org_id!=null">and c.org_id=#{org_id}</if>
+            <if test="org_id!=null and org_ids==null">and c.org_id=#{org_id}</if>
+            <if test="org_ids!=null">and c.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         </where>
     </select>
 
@@ -524,7 +530,9 @@
             <if test="trade_type!=null">and o.gateway in
                 <foreach collection="trade_type" item="gateway" open="(" close=")" separator=",">#{gateway}</foreach>
             </if>
-            <if test="org_id!=null">and p.org_id=#{org_id}</if>
+            <if test="org_id!=null and org_ids==null">and p.org_id=#{org_id}</if>
+            <if test="org_ids!=null">and p.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
             <if test="from!=null">and o.create_time &gt;= #{from}</if>
             <if test="to!=null">and o.create_time &lt; #{to}</if>
             <if test="date!=null">and date(o.create_time)=date(#{date})</if>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index aeee99c0f..141aa0ba3 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
@@ -272,7 +272,9 @@
         </if>
         <if test="from!=null">and t.transaction_time &gt;= #{from}</if>
         <if test="to!=null">and t.transaction_time &lt; #{to}</if>
-        <if test="org_id!=null">and c.org_id = #{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and c.org_id = #{org_id}</if>
+        <if test="org_ids!=null">and c.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         GROUP BY DATE(t.transaction_time)
         order by t.clearing_time desc
     </select>
@@ -289,7 +291,9 @@
         <if test="from!=null">and t.transaction_time &gt;= #{from}</if>
         <if test="to!=null">and t.transaction_time &lt; #{to}</if>
         <if test="client_moniker!=null">and c.client_moniker=#{client_moniker}</if>
-        <if test="org_id!=null">and c.org_id = #{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and c.org_id = #{org_id}</if>
+        <if test="org_ids!=null">and c.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         GROUP BY c.client_id
         order by total desc
     </select>
@@ -306,7 +310,9 @@
         <if test="from!=null">and t.transaction_time &gt;= #{from}</if>
         <if test="to!=null">and t.transaction_time &lt; #{to}</if>
         <if test="client_moniker!=null">and c.client_moniker=#{client_moniker}</if>
-        <if test="org_id!=null">and c.org_id = #{org_id}</if>
+        <if test="org_id!=null and org_ids==null">and c.org_id = #{org_id}</if>
+        <if test="org_ids!=null">and c.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
     </select>
 
     <select id="getAusTracData" resultType="com.alibaba.fastjson.JSONObject">

From 2a48f5a6aa4e24dd23007b86508307bc263987a2 Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Wed, 10 Jan 2018 13:53:35 +0800
Subject: [PATCH 3/3] fix

---
 .../manage/signin/core/impls/ManagerAccountServiceImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java
index 9708e6b27..db4a24622 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java
@@ -106,7 +106,8 @@ public class ManagerAccountServiceImpl implements ManagerAccountsService {
 
     @Override
     public List<JSONObject> listBDUsers(JSONObject loginManager) {
-        return managerMapper.listByRole(loginManager.getInteger("org_id"), ManagerRole.BD_USER.getMask());
+        loginManager.put("mask",ManagerRole.BD_USER.getMask());
+        return managerMapper.listByRole(loginManager);
     }
 
     @Override