diff --git a/admin-web/src/pages/Admin/RoleList.js b/admin-web/src/pages/Admin/RoleList.js index a9dbd646e..c17797ba8 100644 --- a/admin-web/src/pages/Admin/RoleList.js +++ b/admin-web/src/pages/Admin/RoleList.js @@ -266,7 +266,6 @@ class RoleList extends PureComponent { render() { const { list, data } = this.props; - const { pageNo, pageSize, count, roleTreeData, checkedKeys, assignModalLoading } = data; const { modalVisible, modalType, initValues, roleAssignVisible } = this.state; diff --git a/admin-web/src/utils/tree.utils.js b/admin-web/src/utils/tree.utils.js index 5733c1ad4..90e5a3601 100644 --- a/admin-web/src/utils/tree.utils.js +++ b/admin-web/src/utils/tree.utils.js @@ -22,20 +22,21 @@ function findNodes(id, nodes) { break; } else if (node.children) { const childNodes = findNodes(id, node.children); - res.push(node.key); for (let j = 0; j < childNodes.length; j += 1) { res.push(childNodes[j]); } - break; } } return res; } export function findAllNodes(resourceIds, nodes) { + console.log('resourceIds', resourceIds); + const findNodesArray = []; for (let i = 0; i < resourceIds.length; i += 1) { const findNodesData = findNodes(resourceIds[i], nodes); + console.log('findNodesData', findNodesData); if (findNodesData) { for (let j = 0; j < findNodesData.length; j += 1) { const jD = findNodesData[j];