From ee0b68e8a5c7457a00bcba1680beb2ac234d0fd6 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Mon, 4 Jun 2018 20:21:44 +0800
Subject: [PATCH 1/2] fix~

---
 .../application/web/SimpleClientManageController.java       | 6 ++++--
 .../payment/partner/templates/partners_applications.html    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientManageController.java b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientManageController.java
index 5802d21fe..ad049b8f2 100644
--- a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientManageController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientManageController.java
@@ -3,7 +3,9 @@ package au.com.royalpay.payment.manage.application.web;
 import au.com.royalpay.payment.manage.application.beans.ClientApplyQueryBean;
 import au.com.royalpay.payment.manage.application.core.SimpleClientApplyManageService;
 import au.com.royalpay.payment.manage.mappers.preapply.SysClientPreMapperMapper;
+import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
 import au.com.royalpay.payment.tools.CommonConsts;
+import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.web.bind.annotation.*;
 
@@ -18,12 +20,12 @@ public class SimpleClientManageController {
     @Resource
     private SimpleClientApplyManageService simpleClientApplyManageService;
 
-    @RequestMapping(method = RequestMethod.GET)
+    @ManagerMapping(method = RequestMethod.GET,role = {ManagerRole.ADMIN, ManagerRole.OPERATOR})
     public JSONObject listApply(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,ClientApplyQueryBean clientApplyQueryBean){
        return  simpleClientApplyManageService.listsApplies(manager,clientApplyQueryBean);
     }
 
-    @RequestMapping(value = "/getOne/{client_pre_apply_id}",method = RequestMethod.GET)
+    @ManagerMapping(value = "/getOne/{client_pre_apply_id}",method = RequestMethod.GET,role = {ManagerRole.ADMIN, ManagerRole.OPERATOR})
     public JSONObject findOneApply(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String client_pre_apply_id){
         return  simpleClientApplyManageService.findOneApply(manager,client_pre_apply_id);
     }
diff --git a/src/main/ui/static/payment/partner/templates/partners_applications.html b/src/main/ui/static/payment/partner/templates/partners_applications.html
index daebf51bc..6d3cb3ff6 100644
--- a/src/main/ui/static/payment/partner/templates/partners_applications.html
+++ b/src/main/ui/static/payment/partner/templates/partners_applications.html
@@ -17,7 +17,7 @@
                         <li ui-sref-active-eq="active">
                             <a ui-sref="partner_application">Partner Application</a>
                         </li>
-                        <li ui-sref-active="active">
+                        <li ui-sref-active="active" ng-if="('10'|withRole) || ('1'|withRole)">
                             <a ui-sref="partner_application.simple_application">Application & Open</a>
                         </li>
                     </ul>

From 0be9a6548d2dcbe1ea612ebf4024a593e7b5bc4d Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Mon, 4 Jun 2018 20:22:38 +0800
Subject: [PATCH 2/2] fix~

---
 .../static/payment/partner/templates/partners_applications.html  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/ui/static/payment/partner/templates/partners_applications.html b/src/main/ui/static/payment/partner/templates/partners_applications.html
index 6d3cb3ff6..4f9f53f4a 100644
--- a/src/main/ui/static/payment/partner/templates/partners_applications.html
+++ b/src/main/ui/static/payment/partner/templates/partners_applications.html
@@ -17,6 +17,7 @@
                         <li ui-sref-active-eq="active">
                             <a ui-sref="partner_application">Partner Application</a>
                         </li>
+
                         <li ui-sref-active="active" ng-if="('10'|withRole) || ('1'|withRole)">
                             <a ui-sref="partner_application.simple_application">Application & Open</a>
                         </li>