diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/bean/RiskEventQuery.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/bean/RiskEventQuery.java
index 255f873d9..d985cd22c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/bean/RiskEventQuery.java
+++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/bean/RiskEventQuery.java
@@ -41,6 +41,8 @@ public class RiskEventQuery {
     // 邮件回复截止日期
     private String replyEmailDate;
 
+    private Integer page = 1;
+
     public Integer getOrderType() {
         return orderType;
     }
@@ -113,6 +115,14 @@ public class RiskEventQuery {
         this.replyEmailDate = replyEmailDate;
     }
 
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
     public JSONObject toJSON() {
 
         JSONObject params = new JSONObject();
@@ -154,6 +164,10 @@ public class RiskEventQuery {
             params.put("reply_email_date", replyEmailDate);
         }
 
+        if (page != null && page > 0) {
+            params.put("page", page);
+        }
+
         return params;
     }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
index 64933b72d..2f10af19e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
@@ -87,7 +87,7 @@ public class RiskBusinessServiceImpl implements RiskBusinessService {
     @Override
     public JSONObject getRiskEventsByPage(JSONObject params) {
 
-        PageList<JSONObject> riskEvents = riskEventMapper.listRisksByPage(params, new PageBounds(1, 10, Order.formString("create_time.desc")));
+        PageList<JSONObject> riskEvents = riskEventMapper.listRisksByPage(params, new PageBounds(params.getInteger("page"), 10, Order.formString("create_time.desc")));
         return PageListUtils.buildPageListResult(riskEvents);
     }
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java
index a43459b3f..f893da222 100644
--- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java
@@ -4,6 +4,7 @@ import au.com.royalpay.payment.manage.merchants.core.ClientManager;
 import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
 import au.com.royalpay.payment.manage.riskbusiness.bean.RiskEventQuery;
 import au.com.royalpay.payment.manage.riskbusiness.core.RiskBusinessService;
+import au.com.royalpay.payment.manage.riskbusiness.enums.RiskResultTypeEnum;
 import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
 import com.alibaba.fastjson.JSONObject;
@@ -99,6 +100,9 @@ public class RiskBusinessController {
                                       @PathVariable("channel") String channel,
                                       @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
         clientManager.switchChannelPermission(manager, params.getString("client_moniker"), channel, channelFlag);
+
+        if (channelFlag)
+            params.put("result_type", RiskResultTypeEnum.ALREADY_HANDLED.getResultType());
         riskBusinessService.updateRiskEvent(params);
     }
 
@@ -107,10 +111,17 @@ public class RiskBusinessController {
                                     @PathVariable("isValid") Boolean isValid,
                                     @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
         String clientMoniker = params.getString("client_moniker");
-        if (isValid)
+        if (isValid) {
             clientManager.disableClient(clientMoniker, manager);
-        else
+            Integer temporaryCloseMerchant = params.getInteger("temporary_close_merchant");
+            if (temporaryCloseMerchant != 1) {
+                params.put("result_type", RiskResultTypeEnum.ALREADY_HANDLED.getResultType());
+            }
+        }
+        else {
             clientManager.revertClient(clientMoniker, manager);
+            params.put("result_type", RiskResultTypeEnum.ALREADY_HANDLED.getResultType());
+        }
         riskBusinessService.updateRiskEvent(params);
 
     }
diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html
index cae8734e4..e890e7173 100644
--- a/src/main/ui/static/analysis/templates/riskEvent_detail.html
+++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html
@@ -8,10 +8,10 @@
             <div class="nav-tabs-custom">
                 <ul class="nav nav-tabs">
                     <li ui-sref-active-eq="active">
-                        <a ui-sref="analysis_monitoring.riskEvent_detail">Risk Detail</a>
+                        <a ui-sref="analysis_monitoring.riskEvent_detail" ui-sref-opts="{reload:true}">Risk Detail</a>
                     </li>
                     <li ui-sref-active="active">
-                        <a ui-sref=".audit_material">Audit material</a>
+                        <a ui-sref=".audit_material" ui-sref-opts="{reload:true}">Audit material</a>
                     </li>
                 </ul>
                 <div class="tab-content" ui-view>
@@ -50,8 +50,9 @@
                                                 <div class="form-group" ng-if="riskEvent.order_type == 1 || riskEvent.order_type == 5">
                                                     <label class="control-label col-sm-2">Sub Merchant ID</label>
                                                     <div class="col-sm-10">
-                                                        <p class="form-control-static"
-                                                           ng-bind="clientInfo.sub_merchant_id"></p>
+                                                        <p class="form-control-static">
+                                                            {{clientInfo.sub_merchant_id || riskEvent.sub_merchant_id}}
+                                                        </p>
                                                     </div>
                                                 </div>
 
@@ -223,9 +224,9 @@
                                                 </span>
                                                         <span ng-if="(trade.channel == 'hf') || (trade.channel == 'Rpay')"> - </span>
                                                     </td>
-                                                    <td ng-bind="trade.status | tradeStatus"></td>
+                                                    <td ng-bind="trade.status"></td>
                                                     <td ng-bind="trade.create_time"></td>
-                                                    <td ng-bind="trade.gateway | tradeGateway"></td>
+                                                    <td ng-bind="trade.gateway"></td>
                                                 </tr>
                                                 </tbody>
                                             </table>
@@ -233,7 +234,7 @@
                                     </div>
 
                                     <a role="button"
-                                       ng-if="riskEvent.order_type <= 1"
+                                       ng-if="riskEvent.result_type <= 1"
                                        class="btn btn-info"
                                        ng-click="resendUploadEmail()">Send Email {{riskEvent.result_type == 1 ? 'again' : ''}}
                                     </a>
@@ -258,6 +259,31 @@
                                     <div class="panel-heading">RiskEvent Basic Information</div>
                                     <div class="panel-body">
                                         <div class="form-horizontal">
+                                            <div class="form-group"
+                                                 ng-class="{'has-error':riskEventForm.order_type.$invalid && riskEventForm.order_type.$dirty}">
+                                                <label class="control-label col-sm-2"
+                                                       for="order-type-input">Order Type
+                                                </label>
+                                                <div class="col-sm-8">
+                                                    <select class="form-control"
+                                                            name="order_type"
+                                                            disabled
+                                                            ng-model="riskEventEdit.order_type"
+                                                            id="order-type-input"
+                                                            required
+                                                            ng-options="key as value for (key, value) in orderTypes">
+                                                        <option value="">Please Choose</option>
+                                                    </select>
+
+                                                    <div ng-messages="riskEventForm.order_type.$error"
+                                                         ng-if="riskEventForm.order_type.$dirty">
+                                                        <p class="small text-danger"
+                                                           ng-message="required">required field
+                                                        </p>
+                                                    </div>
+                                                </div>
+                                            </div>
+
                                             <div class="form-group"
                                                  ng-if="riskEventEdit.order_type != 5"
                                                  ng-class="{'has-error':riskEventForm.client_moniker.$invalid && riskEventForm.client_moniker.$dirty}">
@@ -289,30 +315,6 @@
                                                 </div>
                                             </div>
 
-                                            <div class="form-group"
-                                                 ng-class="{'has-error':riskEventForm.order_type.$invalid && riskEventForm.order_type.$dirty}">
-                                                <label class="control-label col-sm-2"
-                                                       for="order-type-input">Order Type
-                                                </label>
-                                                <div class="col-sm-8">
-                                                    <select class="form-control"
-                                                            name="order_type"
-                                                            ng-model="riskEventEdit.order_type"
-                                                            id="order-type-input"
-                                                            required
-                                                            ng-options="key as value for (key, value) in orderTypes">
-                                                        <option value="">Please Choose</option>
-                                                    </select>
-
-                                                    <div ng-messages="riskEventForm.order_type.$error"
-                                                         ng-if="riskEventForm.order_type.$dirty">
-                                                        <p class="small text-danger"
-                                                           ng-message="required">required field
-                                                        </p>
-                                                    </div>
-                                                </div>
-                                            </div>
-
                                             <div class="form-group"
                                                  ng-if="riskEventEdit.order_type != 4"
                                                  ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}">