add 商户合规增加合规专员显示

master
luoyang 5 years ago
parent 2d7699dc3a
commit 5d1b5a025d

@ -267,11 +267,21 @@
</select> </select>
<select id="comListPartners" resultType="com.alibaba.fastjson.JSONObject"> <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 FROM sys_clients c
inner join sys_client_config cc on cc.client_id = c.client_id inner join sys_client_config cc on cc.client_id = c.client_id
inner join sys_org o inner join sys_org o
on o.org_id=c.org_id 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"> <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 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 date(d.start_date)&lt;= date(now()) and (d.end_date is null or date(d.end_date)&gt;= date(now())) and

@ -273,6 +273,7 @@
<th style="padding: 12px;">Compliance Status</th> <th style="padding: 12px;">Compliance Status</th>
<th style="padding: 12px;">Organization</th> <th style="padding: 12px;">Organization</th>
<th style="padding: 12px;">BD</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 style="padding: 12px;" ng-if="'client_detail_by_moniker'|withFunc">Operation
</th> </th>
</tr> </tr>
@ -319,6 +320,7 @@
</td> </td>
<td ng-bind="partner.org_name"></td> <td ng-bind="partner.org_name"></td>
<td ng-bind="partner.bd_user_name"></td> <td ng-bind="partner.bd_user_name"></td>
<td ng-bind="partner.operator"></td>
<td ng-if="'client_detail_by_moniker'|withFunc"> <td ng-if="'client_detail_by_moniker'|withFunc">
<a class="text-primary" role="button" title="Detail" <a class="text-primary" role="button" title="Detail"
ui-sref="partners.detail({clientMoniker:partner.client_moniker})"> ui-sref="partners.detail({clientMoniker:partner.client_moniker})">

Loading…
Cancel
Save