diff --git a/shandan-bianmu/src/main/resources/static/js/business/directory/directory.js b/shandan-bianmu/src/main/resources/static/js/business/directory/directory.js index f36aea0..b147b9b 100644 --- a/shandan-bianmu/src/main/resources/static/js/business/directory/directory.js +++ b/shandan-bianmu/src/main/resources/static/js/business/directory/directory.js @@ -704,6 +704,7 @@ function startRender() { success: function (layerObj, index) { directorySelectTree = globalTree.init({ id: 'moveFileTree', + //url: `${treeChildrenUrl}&all=${operateType !== 'move'}`.replace('busType=0', 'busType=2'), url: `${treeChildrenUrl}&all=${operateType !== 'move'}`, cache: true, scroll: '#moveFileTreeBox', diff --git a/shandan-bianmu/src/main/resources/view/business/directory/directory.html b/shandan-bianmu/src/main/resources/view/business/directory/directory.html index b604ec8..4597473 100644 --- a/shandan-bianmu/src/main/resources/view/business/directory/directory.html +++ b/shandan-bianmu/src/main/resources/view/business/directory/directory.html @@ -12,7 +12,7 @@ const user = JSON.parse(user_str); const ReadPermisDirIds = /*[[${readDirIds}]]*/ []; const WritePermisDirIds = /*[[${writeDirIds}]]*/ []; - // 目录业务类型,0:资源目录;1:基础数据目录 + // 目录业务类型,0:资源目录;1:基础数据目录,2:资源目录+基础目录 const bus_type = 0; diff --git a/shandan-common/src/main/resources/static/js/common/common.js b/shandan-common/src/main/resources/static/js/common/common.js index ff10c92..8fcdc21 100644 --- a/shandan-common/src/main/resources/static/js/common/common.js +++ b/shandan-common/src/main/resources/static/js/common/common.js @@ -42,6 +42,7 @@ const viewType = { const DIR_ROOT_ID = "ROOT"; // 主题目录根节点ID const DIR_THEME_ROOT_ID = "ROOT_THEME"; +const DIR_BASIC_ROOT_ID = "ROOT_BASIC_DATA"; /** * 审核数据实体类型 diff --git a/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/DirectoryTreeService.java b/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/DirectoryTreeService.java index 29d4a31..6caf24c 100644 --- a/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/DirectoryTreeService.java +++ b/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/DirectoryTreeService.java @@ -129,15 +129,24 @@ public class DirectoryTreeService { private List getDirectoryList(DirectoryVo parentDir, boolean allChild, boolean hasResource, int busType) { QueryWrapper wrapper = new QueryWrapper<>(); if (parentDir == null) { - wrapper.eq("ID", "ROOT"); + switch (busType) { + case 2: + wrapper.in("ID", "ROOT", "ROOT_BASIC_DATA"); + break; + case 1: + wrapper.eq("ID", "ROOT_BASIC_DATA"); + break; + case 0: + default: + wrapper.eq("ID", "ROOT"); + } } else { - wrapper.in(!hasResource, "DIRECTORY_TYPE", DirectoryType.DIRECTORY, DirectoryType.LINK_DIR).eq("IS_BASIC_DIR", busType); - if (parentDir != null) { - if (allChild) { - wrapper.likeRight("DIRECTORY_PATH", parentDir.getDirectoryPath() + "/"); - } else { - wrapper.eq("PARENT_ID", parentDir.getId()); - } + wrapper.in(!hasResource, "DIRECTORY_TYPE", DirectoryType.DIRECTORY, DirectoryType.LINK_DIR).eq("IS_BASIC_DIR", (busType == 1 || busType == 2)); + + if (allChild) { + wrapper.likeRight("DIRECTORY_PATH", parentDir.getDirectoryPath() + "/"); + } else { + wrapper.eq("PARENT_ID", parentDir.getId()); } } diff --git a/shandan-system/src/main/resources/static/js/business/directory/directory-basicdata.js b/shandan-system/src/main/resources/static/js/business/directory/directory-basicdata.js index 5a2143a..ce75ced 100644 --- a/shandan-system/src/main/resources/static/js/business/directory/directory-basicdata.js +++ b/shandan-system/src/main/resources/static/js/business/directory/directory-basicdata.js @@ -153,7 +153,7 @@ function startRender() { loadToolbarBefore: function (buttons, param, $div) { const {basicData} = param; // 根据数据审核状态判断是否显示相关功能按钮 - if (basicData && basicData.id !== DIR_ROOT_ID && basicData.id !== DIR_THEME_ROOT_ID) { + if (basicData && basicData.id !== DIR_ROOT_ID && basicData.id !== DIR_THEME_ROOT_ID && basicData.id !== DIR_BASIC_ROOT_ID) { switch (basicData.reviewStatus) { case ReviewStatus.SUBMITTED: case ReviewStatus.PASS: