Merge branch 'hotfix' into develop

src/main/java/au/com/royalpay/payment/manage/risk/web/RiskController.java

@@ -8,6 +8,7 @@ import au.com.royalpay.payment.manage.risk.bean.QueryRiskOrder;
 import au.com.royalpay.payment.manage.risk.bean.QueryRiskRecord;
 import au.com.royalpay.payment.manage.risk.core.RiskMerchantService;
 import au.com.royalpay.payment.tools.CommonConsts;
+import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
 
 import com.alibaba.fastjson.JSONObject;
 
@@ -24,7 +25,7 @@ import javax.annotation.Resource;
  * Created by wangning on 08/12/2016.
  */
 @RestController
-@ManagerMapping(value = "/sys/risk")
+@ManagerMapping(value = "/sys/risk",role = {ManagerRole.ADMIN,ManagerRole.OPERATOR})
 public class RiskController {
 
     @Resource

src/main/ui/static/analysis/monitoring/templates/analysis_monitoring.html

@@ -19,7 +19,7 @@
             <li ui-sref-active-eq="active" ng-if="('monitor'|withModule)&&(currentUser.org_id==null)">
                 <a ui-sref="analysis_monitoring.pre_refund"><i class="fa fa-tv"></i> <span>欠款|Pre Refund</span></a>
             </li>
-            <li ui-sref-active-eq="active">
+            <li ui-sref-active-eq="active" ng-if="('monitor'|withModule)&&(currentUser.org_id==null)">
                 <a ui-sref="analysis_monitoring.risk_manager"><i class="fa fa-tv"></i> <span>风控记录|Risk Records</span></a>
             </li>