fix

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -2580,6 +2580,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     @Override
+    @Transactional
     public void commitToCompliance(String clientMoniker, JSONObject manager) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);
         if (client == null) {
@@ -2640,7 +2641,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 log.put("open_status_from", open_status_form);
             }
             log.put("open_status_to", open_status_to);
-            log.put("operator_id", manager.getString("manager_id"));
+            log.put("operator_id", StringUtils.isNotEmpty(manager.getString("manager_id"))?manager.getString("manager_id"):manager.getString("account_id"));
             log.put("operator", manager.getString("display_name"));
             log.put("create_time", new Date());
             log.put("remark", remark);

src/main/ui/static/payment/partner/templates/partners.html

@@ -503,7 +503,7 @@
                                         <span ng-if="partner.approve_result==0 && partner.approve_time">不通过({{partner.approve_time}})</span>
                                         <span ng-if="partner.approve_result==5 && partner.approve_time && partner.refuse_remark">申请打回({{partner.refuse_remark|limitTo:15}})</span>
                                         <span ng-if="(partner.open_status==1||partner.open_status==4) && partner.approve_result!=3"><i ng-if="partner.refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span>
-                                        <span ng-if="partner.approve_result==3 && (!partner.open_status || partner.open_status==1)">自助开通（等待合规）</span>
+                                        <span ng-if="partner.approve_result==3 && (!partner.open_status || partner.open_status==4)">自助开通（等待合规）</span>
                                         <span ng-if="partner.open_status==2">合同制作完成</span>
                                         <span ng-if="partner.open_status==3 && partner.approve_result!=5">等待BD上传材料审核</span>
                                         <span ng-if="partner.open_status==10">绿色通道申请中</span>