@@ -713,6 +713,12 @@ export default {
|
||||
}
|
||||
this.selectDeptOnTree(deptId);
|
||||
},
|
||||
startDeptTreeFromSecondLevel(tree) {
|
||||
if (!Array.isArray(tree) || !tree.length) {
|
||||
return [];
|
||||
}
|
||||
return tree.flatMap(node => (Array.isArray(node.children) ? node.children : []));
|
||||
},
|
||||
findDeptIdByName(name, tree = this.permissionDeptTree) {
|
||||
if (!name) return null;
|
||||
for (const node of tree || []) {
|
||||
@@ -733,7 +739,7 @@ export default {
|
||||
const tenantId = this.userInfo.tenantId || this.website.tenantId;
|
||||
try {
|
||||
const res = await getDeptTree(tenantId);
|
||||
this.permissionDeptTree = res.data.data || [];
|
||||
this.permissionDeptTree = this.startDeptTreeFromSecondLevel(res.data.data || []);
|
||||
} catch (error) {
|
||||
this.$message.error('组织树加载失败');
|
||||
return;
|
||||
@@ -963,9 +969,11 @@ export default {
|
||||
column.dicData = res.data.data;
|
||||
});
|
||||
getDeptTree(tenantId).then(res => {
|
||||
this.permissionDeptTree = res.data.data;
|
||||
// 用户管理组织从第二级开始展示:去掉一级根节点,保留其子节点
|
||||
const deptTree = this.startDeptTreeFromSecondLevel(res.data.data || []);
|
||||
this.permissionDeptTree = deptTree;
|
||||
const column = this.findColumn(this.userOption.group, 'deptId');
|
||||
column.dicData = res.data.data;
|
||||
column.dicData = deptTree;
|
||||
});
|
||||
getPostList(tenantId).then(res => {
|
||||
this.postList = res.data.data;
|
||||
|
||||
Reference in New Issue
Block a user