From a2b3d0c9c48753d09fa7348fa617fc1f04c1b2a6 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 16 Apr 2020 16:21:36 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=95=86=E6=88=B7=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E8=A7=84=E4=B8=93=E5=91=98=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                              |  2 +-
 .../payment/manage/mappers/system/ClientMapper.xml   | 12 +++++++++++-
 .../partner/templates/partner_compliance.html        |  2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ee1052640..d35fb8a2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.1.8</version>
+    <version>2.1.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/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
index d8c87e1da..e2330f9de 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
@@ -267,11 +267,21 @@
     </select>
 
     <select id="comListPartners" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT DISTINCT c.*,o.name org_name
+        SELECT DISTINCT c.*,o.name org_name,tmp.operator
         FROM sys_clients c
         inner join sys_client_config cc on cc.client_id = c.client_id
         inner join sys_org o
         on o.org_id=c.org_id
+        INNER JOIN (
+        SELECT
+        client_id,
+        GROUP_CONCAT( DISTINCT ap.operator ) AS operator
+        FROM
+        sys_clients_audit_process ap
+        INNER JOIN sys_managers m ON ap.operator_id = m.manager_id
+        AND <![CDATA[ m.role & 2 >0 ]]>
+        GROUP BY ap.client_id
+        ) tmp ON tmp.client_id = c.client_id
         <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
diff --git a/src/main/ui/static/payment/partner/templates/partner_compliance.html b/src/main/ui/static/payment/partner/templates/partner_compliance.html
index 18d6bfe7a..8801b6b0e 100644
--- a/src/main/ui/static/payment/partner/templates/partner_compliance.html
+++ b/src/main/ui/static/payment/partner/templates/partner_compliance.html
@@ -273,6 +273,7 @@
                                     <th style="padding: 12px;">Compliance Status</th>
                                     <th style="padding: 12px;">Organization</th>
                                     <th style="padding: 12px;">BD</th>
+                                    <th style="padding: 12px;">Compliance Manager</th>
                                     <th style="padding: 12px;" ng-if="'client_detail_by_moniker'|withFunc">Operation
                                     </th>
                                 </tr>
@@ -319,6 +320,7 @@
                                     </td>
                                     <td ng-bind="partner.org_name"></td>
                                     <td ng-bind="partner.bd_user_name"></td>
+                                    <td ng-bind="partner.operator"></td>
                                     <td ng-if="'client_detail_by_moniker'|withFunc">
                                         <a class="text-primary" role="button" title="Detail"
                                            ui-sref="partners.detail({clientMoniker:partner.client_moniker})">