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 <= temp.create_time and
d.is_valid = '1'
AND (d.end_date is null or d.end_date > temp.create_time)
-
+
INNER JOIN sys_managers m on m.manager_id = d.bd_id and m.org_id = #{org_id}
+
+ INNER JOIN sys_managers m on m.manager_id = d.bd_id and m.org_id in
+ #{org_id}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
]]>
- and c.org_id=#{org_id}
+ and c.org_id=#{org_id}
+ and c.org_id in
+ #{org_id}and c.source=1and c.source!=1
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
]]>
- m.org_id=#{org_id}
+ m.org_id=#{org_id}
+ and m.org_id in
+ #{org_id}and m.manager_id in (select manager_id from financial_bd_config where (bd_group=#{bd_group} or manager_id=#{bd_group}))
GROUP BY m.manager_id
@@ -78,7 +80,9 @@
GROUP BY c.client_id
) c
- c.org_id=#{org_id}
+ c.org_id=#{org_id}
+ and c.org_id in
+ #{org_id}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 @@
]]>
and c.approve_result=1 and c.is_valid=1
-
+
and c.org_id=#{org_id}
+ and c.org_id in
+ #{org_id}
\ 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 @@
and o.customer_id=#{customer_id}
- and o.org_id=#{org_id}
+ and o.org_id=#{org_id}
+ and o.org_id in
+ #{org_id}
GROUP BY o.customer_id ORDER BY points desc
@@ -248,7 +250,9 @@
and o.customer_id=#{customer_id}
- and o.org_id=#{org_id}
+ and o.org_id=#{org_id}
+ and o.org_id in
+ #{org_id}
\ 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 @@
and o.client_id=#{client_id}
- and l.org_id=#{org_id}
+ and l.org_id=#{org_id}
+ and l.org_id in
+ #{org_id}
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}
- and c.org_id=#{org_id}
+ and c.org_id=#{org_id}
+ and c.org_id in
+ #{org_id}
and c.is_valid=1
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 @@
and d.client_type=#{client_type}
-
+
and c.org_id=#{org_id}
+ and c.org_id in
+ #{org_id}
\ 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}
- and c.org_id=#{org_id}
+ and c.org_id=#{org_id}
+ and c.org_id in
+ #{org_id}and c.referrer_id=#{referrer_id}and c.is_valid=1
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}
- and c.org_id=#{org_id}
+ and c.org_id=#{org_id}and c.org_id in
#{org_id}and c.referrer_id=#{referrer_id}
@@ -191,7 +191,9 @@
and c.remark like #{name_pattern}
- and c.org_id=#{org_id}
+ and c.org_id=#{org_id}
+ and c.org_id in
+ #{org_id}
and c.is_valid=1
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
]]>
- and m.org_id=#{org_id}
+ and m.org_id=#{org_id}
+ and org_id in
+ #{org_id}
@@ -42,7 +46,9 @@
SELECT m.* FROM sys_managers m
WHERE role & #{mask} >0 and m.is_valid=1
]]>
- and m.org_id=#{org_id}
+ and m.org_id=#{org_id}
+ and m.org_id in
+ #{org_id}