From 93ae3a727511581a571da233efd40072777ecd21 Mon Sep 17 00:00:00 2001 From: luoyang14z7 <704328506@qq.com> Date: Fri, 6 Jul 2018 17:42:36 +0800 Subject: [PATCH] fix : develop_client_permission --- .../manager/ManagerUserInterceptor.java | 6 +++--- .../ui/static/config/sysconfigs/sysconfigs.js | 16 ---------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java b/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java index 73bf94afc..644449dcd 100644 --- a/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java +++ b/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java @@ -1,6 +1,6 @@ package au.com.royalpay.payment.manage.permission.manager; -import au.com.royalpay.payment.manage.management.sysconfig.core.PartnerPermissionManager; +import au.com.royalpay.payment.manage.management.sysconfig.core.PermissionPartnerManager; import au.com.royalpay.payment.manage.management.sysconfig.core.PermissionManager; import au.com.royalpay.payment.manage.signin.core.SignInStatusManager; import au.com.royalpay.payment.tools.CommonConsts; @@ -35,7 +35,7 @@ public class ManagerUserInterceptor extends HandlerInterceptorAdapter implements @Resource private PermissionManager permissionManager; @Resource - private PartnerPermissionManager partnerPermissionManager; + private PermissionPartnerManager permissionPartnerManager; @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { @@ -104,7 +104,7 @@ public class ManagerUserInterceptor extends HandlerInterceptorAdapter implements } } - JSONObject func = partnerPermissionManager.getPartnerFuncById(funcId); + JSONObject func = permissionPartnerManager.getPartnerFuncById(funcId); if(func!=null && StringUtils.isNotEmpty(func.getString("module_id"))){ JSONArray arr = loginUser.getJSONArray("available_module_ids"); if (arr == null || !arr.contains(func.getString("module_id"))) { diff --git a/src/main/ui/static/config/sysconfigs/sysconfigs.js b/src/main/ui/static/config/sysconfigs/sysconfigs.js index a653673d8..ccda9b062 100644 --- a/src/main/ui/static/config/sysconfigs/sysconfigs.js +++ b/src/main/ui/static/config/sysconfigs/sysconfigs.js @@ -517,7 +517,6 @@ define(['angular', 'uiRouter'], function (angular) { } }) if (hasOne != 1) { - $http.put('/sys/permissionPartner/modules/' + $scope.module.module_name + '.end', $scope.module).then(function () { $scope.$close(); }, function (resp) { @@ -527,20 +526,5 @@ define(['angular', 'uiRouter'], function (angular) { }; }]); - - - - - - - - - - - - - - - return app; }); \ No newline at end of file