From db1f6275e575ac1768732e3bf8ce02b9ebde7587 Mon Sep 17 00:00:00 2001
From: liuxinxin <xinxin.liu@geekforbest.com>
Date: Mon, 16 Dec 2019 18:04:28 +0800
Subject: [PATCH] [R] fix

---
 .../payment/manage/mappers/system/ClientMapper.xml   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 f24cb65b8..a5a1804e7 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
@@ -774,7 +774,7 @@
         SELECT c.client_moniker,c.short_name,c.create_time,c.bd_user_name,c.approve_result,c.approve_time,c.open_status,
         c.source AS client_source,c.refuse_remark,a.* FROM sys_clients c LEFT JOIN client_authfile_compliance a ON c.client_id = a.client_id AND a.type=2
         <if test="bd_user!=null">
-            INNER JOIN sys_client_bd d ON a.client_id = d.client_id AND d.bd_id = #{bd_user} and
+            INNER JOIN sys_client_bd d ON c.client_id = d.client_id AND d.bd_id = #{bd_user} and
             date(d.start_date)&lt;= date(now()) and (d.end_date is null or date(d.end_date)&gt;= date(now())) and
             d.is_valid=1
         </if>
@@ -801,13 +801,13 @@
 
     <select id="countKycClients" resultType="int">
         SELECT count(1) FROM sys_clients c
+        <if test="bd_user!=null">
+            INNER JOIN sys_client_bd d ON c.client_id = d.client_id AND d.bd_id = #{bd_user} and
+            date(d.start_date)&lt;= date(now()) and (d.end_date is null or date(d.end_date)&gt;= date(now())) and
+            d.is_valid=1
+        </if>
         <where>
             and c.is_valid=1
-            <if test="bd_user!=null">
-                INNER JOIN sys_client_bd d ON c.client_id = d.client_id AND d.bd_id = #{bd_user} and
-                date(d.start_date)&lt;= date(now()) and (d.end_date is null or date(d.end_date)&gt;= date(now())) and
-                d.is_valid=1
-            </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 fb ON fb.manager_id=b.bd_id