Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

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);
     }

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

@@ -17,7 +17,8 @@
                         <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>