Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

role permission

See merge request root/atms!221

atms-web/src/main/webapp/app/admin/infrastructure/roleManage/controllers/role-manage.ctrl.js

 infrastructureModule
-.controller('RoleManageController', ['$scope', '$log', '$translate', 'roleService', 'risDialog', 'permissionService', '$state', '$q', '$timeout',
+.controller('RoleManageController', ['$scope', '$log', '$translate', 'loginContext', 'roleService', 'risDialog', 'permissionService', '$state', '$q', '$timeout',
     'menuService', 'uiGridConstants', 'SweetAlert', 'userService',
-    function ($scope, $log, $translate, roleService, risDialog, permissionService, $state, $q, $timeout, menuService,
+    function ($scope, $log, $translate, loginContext, roleService, risDialog, permissionService, $state, $q, $timeout, menuService,
          uiGridConstants, SweetAlert, userService) {
         'use strict';
 
@@ -748,15 +748,27 @@
         /*-------------------------------------------------------org list function start-------------------------------------------------*/
         //init org list
         var initRoleList = function () {
+            var isSuperAdmin;
+            userService.getUserPermissionNew(loginContext.userName, function (data) {
+                isSuperAdmin = data.isSuperAdmin;
+            });
             $scope.isSelected = false;
             roleService.getRoleListByServiceGroup().success(function (roleData) {
-
+                if(!isSuperAdmin){
+                    roleData[0].subRoles = [roleData[0].subRoles[0]];
+                }
                 console.log('roleData:', roleData);
                 $scope.roleList = roleData;
                 if (roleData[0].subRoles != null && roleData[0].subRoles !== undefined && roleData[0].subRoles[0]) {
                     permissionService.getAllPermissions($scope.serviceType).success(function (data) {
                         $scope.allRawPermissionTreeViewData = data;
-                        $scope.allPermissionTreeViewData = data;
+                        if(!isSuperAdmin){
+                            data[0].items[0].items.splice(3,1);
+                            data[0].items[0].items[2].items.splice(1,2);
+                            $scope.allPermissionTreeViewData = data;
+                        } else {
+                            $scope.allPermissionTreeViewData = data;
+                        }
                         selectRole(roleData[0].subRoles[0]);
                     });
                 }