diff --git a/apollo-portal/src/main/resources/static/scripts/controller/role/AppRoleController.js b/apollo-portal/src/main/resources/static/scripts/controller/role/AppRoleController.js index b77ba72917c23842453a516953b832f989ea4645..b2d8fb00c10eb87a82c673b743add32b9fb10512 100644 --- a/apollo-portal/src/main/resources/static/scripts/controller/role/AppRoleController.js +++ b/apollo-portal/src/main/resources/static/scripts/controller/role/AppRoleController.js @@ -25,7 +25,12 @@ role_module.controller('AppRoleController', $scope.assignMasterRoleToUser = function () { - var toAssignMasterRoleUser = $('.' + $scope.userSelectWidgetId).select2('data')[0].id; + var user = $('.' + $scope.userSelectWidgetId).select2('data')[0]; + if (!user){ + toastr.warning("请选择用户"); + return; + } + var toAssignMasterRoleUser = user.id; PermissionService.assign_master_role($scope.pageContext.appId, toAssignMasterRoleUser) .then(function (result) { diff --git a/apollo-portal/src/main/resources/static/scripts/controller/role/NamespaceRoleController.js b/apollo-portal/src/main/resources/static/scripts/controller/role/NamespaceRoleController.js index 2538b1abce29689e580e3251e38b1a543038bc80..12a54039066c2a2faf7e90c055b485bb504d1cc4 100644 --- a/apollo-portal/src/main/resources/static/scripts/controller/role/NamespaceRoleController.js +++ b/apollo-portal/src/main/resources/static/scripts/controller/role/NamespaceRoleController.js @@ -32,7 +32,12 @@ role_module.controller('NamespaceRoleController', $scope.assignRoleToUser = function (roleType) { if ('ReleaseNamespace' == roleType) { - var toAssignReleaseNamespaceRoleUser = $('.' + $scope.releaseRoleWidgetId).select2('data')[0].id; + var user = $('.' + $scope.releaseRoleWidgetId).select2('data')[0]; + if (!user){ + toastr.warning("请选择用户"); + return; + } + var toAssignReleaseNamespaceRoleUser = user.id; PermissionService.assign_release_namespace_role($scope.pageContext.appId, $scope.pageContext.namespaceName, toAssignReleaseNamespaceRoleUser) @@ -44,7 +49,12 @@ role_module.controller('NamespaceRoleController', toastr.error(AppUtil.errorMsg(result), "添加失败"); }); } else { - var toAssignModifyNamespaceRoleUser = $('.' + $scope.modifyRoleWidgetId).select2('data')[0].id; + var user = $('.' + $scope.modifyRoleWidgetId).select2('data')[0]; + if (!user){ + toastr.warning("请选择用户"); + return; + } + var toAssignModifyNamespaceRoleUser = user.id; PermissionService.assign_modify_namespace_role($scope.pageContext.appId, $scope.pageContext.namespaceName, toAssignModifyNamespaceRoleUser) @@ -93,7 +103,4 @@ role_module.controller('NamespaceRoleController', list.splice(index, 1); } - $scope.modifyRoleUsersId = 'J_modify_role_users'; - $scope.releaseRoleUsersId = 'J_release_role_users'; - }]);