From f5e9503547615786cf60b2a5077731414e4a4e27 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Wed, 17 Oct 2018 11:32:20 +0800
Subject: [PATCH] [fix]

---
 .../manage/riskbusiness/bean/RiskEventQuery.java   | 14 ++++++++++++++
 .../core/impl/RiskBusinessServiceImpl.java         |  2 +-
 .../analysis/templates/riskEvent_detail.html       |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

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/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html
index cae8734e4..6d0514a4e 100644
--- a/src/main/ui/static/analysis/templates/riskEvent_detail.html
+++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html
@@ -233,7 +233,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>