diff --git a/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java index fd8c8f1e74..14e849d996 100644 --- a/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -159,7 +159,7 @@ public class PanelGroupService { panelGroupRequest.setUserId(userId); panelGroupRequest.setIsAdmin(AuthUtils.getUser().getIsAdmin()); List panelGroupDTOList = extPanelGroupMapper.panelGroupList(panelGroupRequest); - return TreeUtils.mergeTree(panelGroupDTOList, "panel_list"); + return TreeUtils.mergeTree(panelGroupDTOList, "0"); } public List defaultTree(PanelGroupRequest panelGroupRequest) { diff --git a/core/frontend/src/views/panel/list/PanelList.vue b/core/frontend/src/views/panel/list/PanelList.vue index ba07286efe..9ba4421a26 100644 --- a/core/frontend/src/views/panel/list/PanelList.vue +++ b/core/frontend/src/views/panel/list/PanelList.vue @@ -201,7 +201,8 @@ {{ $t('panel.panel_list') }} { - localStorage.setItem('panel-main-tree', JSON.stringify(res.data || [])) + this.rootAuth = res.data ? res.data[0]?.privileges||'':'' + const resMainData = res.data ? res.data[0]?.children || [] : [] + localStorage.setItem('panel-main-tree', JSON.stringify(resMainData)) if (!userCache) { - this.originResourceTree = res.data || [] + this.originResourceTree = resMainData this.sortTypeChange(this.localSortParams) } if (this.responseSource === 'appApply') {