From 4a941aaa32a1ac8cdef7384ce1a44e0899da580a Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Mon, 30 Oct 2023 14:55:40 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/common/util/TreeNodeComparator.java   | 18 ++++++++++++++++++
 .../mapper/xml/LawsDataCenterFolderMapper.xml  |  4 ++--
 .../impl/LawsDataCenterFileServiceImpl.java    |  1 +
 .../impl/LawsDataCenterFolderServiceImpl.java  |  6 ++++++
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/common/util/TreeNodeComparator.java

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<LawsDataCenterFolder> {
+    @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},'%'))
     </select>
 </mapper>
\ 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<LawsDataCenterFil
 					.like(LawsDataCenterFile::getPushRangeIds, CurrentUserUtil.getId())
 			);
 		}
+		queryWrapper.orderByDesc(LawsDataCenterFile::getCreateTime);
         return page(page, queryWrapper);
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFolderServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFolderServiceImpl.java
index 14ded9af..254758c0 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFolderServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFolderServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.modules.laws.common.constant.FieldCommon;
 import com.jero.modules.laws.common.constant.ResultCommon;
 import com.jero.modules.laws.common.util.CurrentUserUtil;
+import com.jero.modules.laws.common.util.TreeNodeComparator;
 import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile;
 import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFolder;
 import com.jero.modules.laws.dataCenter.mapper.LawsDataCenterFolderMapper;
@@ -81,6 +82,9 @@ public class LawsDataCenterFolderServiceImpl extends ServiceImpl<LawsDataCenterF
 		List<LawsDataCenterFolder> 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<LawsDataCenterF
 				buildChildren(child, nodeMap);
 			}
 		});
+		// 对子节点进行排序
+		node.getChildren().sort(new TreeNodeComparator());
 	}
 
 	/**