Merge remote-tracking branch 'origin/dev' into dev

src/main/webapp/resources/js/index/app.js

@@ -11621,9 +11621,13 @@
         };
     }]);
 
-    app.controller('RoleEditCtrl', ['$scope', '$modalInstance', '$timeout', 'AccountResource', 'AccountRole', 'toaster', 'role', 'ngAlert', 'BaseService', 'CurrentRole', function ($scope, $modalInstance, $timeout, AccountResource, AccountRole, toaster, role, ngAlert, BaseService, CurrentRole) {
+    app.controller('RoleEditCtrl', ['$scope', '$modalInstance', '$timeout', 'AccountResource', 'AccountRole', 'toaster', 'role', 'ngAlert', 'BaseService', 'CurrentRole', 'AuthenticationService', function ($scope, $modalInstance, $timeout, AccountResource, AccountRole, toaster, role, ngAlert, BaseService, CurrentRole, AuthenticationService) {
         BaseService.scrollBackToTop();
         // 获取当前用户是否为管理员
+        AuthenticationService.getAuthentication().success(function (data) {
+            $scope.loading = false;
+            $scope.user = data;
+        });
         CurrentRole.isManager({}, {}, function (data) {
             $scope.isManager = data.isManager || $scope.user.sys;
         });