diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/TreeNodeComparator.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/TreeNodeComparator.java new file mode 100644 index 00000000..f2b0cd51 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/TreeNodeComparator.java @@ -0,0 +1,18 @@ +package com.jero.modules.laws.common.util; + +import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFolder; + +import java.util.Comparator; + +/** + * @Author: liao + * @Date: 2023/10/30 14:00 + * @Description: 树节点排序 + */ +public class TreeNodeComparator implements Comparator { + @Override + public int compare(LawsDataCenterFolder o1, LawsDataCenterFolder o2) { + // 升序排序 + return Integer.compare(o1.getSort(), o2.getSort()); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/mapper/xml/LawsDataCenterFolderMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/mapper/xml/LawsDataCenterFolderMapper.xml index f16f19d3..f26d8963 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/mapper/xml/LawsDataCenterFolderMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/mapper/xml/LawsDataCenterFolderMapper.xml @@ -26,7 +26,7 @@ ldcf.sort FROM laws_data_center_folder ldcf - WHERE ldcf.owner_id = #{userId} - OR ldcf.auth_view_ids LIKE CONCAT('%',#{userId},'%') + WHERE del_flag = 0 AND (ldcf.owner_id = #{userId} + OR ldcf.auth_view_ids LIKE CONCAT('%',#{userId},'%')) \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java index e7aa6aa8..3a112525 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java @@ -74,6 +74,7 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl roots = folders.stream().filter(folder -> "0".equals(folder.getParentId())).collect(Collectors.toList()); + // 对根节点进行排序 + roots.sort(new TreeNodeComparator()); + // 递归构建子节点 roots.forEach(root -> buildChildren(root, nodeMap)); @@ -119,6 +123,8 @@ public class LawsDataCenterFolderServiceImpl extends ServiceImpl