update 资料中心-文件夹排序

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());
+    }
+}

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>

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);
     }
 

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());
 	}
 
 	/**