收集排序

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -172,7 +172,7 @@
                 #{nodeId}
             </foreach>
         </if>
-        order by u.tree_sort,u.auto_file_sort,u.file_number asc
+        order by u.tree_sort,u.auto_file_sort,u.file_number,u.create_time asc
         limit #{current}, #{size}
     </select>
 

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ArchiveTreeContractController.java

@@ -250,6 +250,11 @@ public class ArchiveTreeContractController extends BladeController {
 //		}
         List<ArchiveTreeContractVO2> tree = archiveTreeContractService.lazyTree2(AuthUtil.getTenantId(), parentId, projectId, contractId);
         if (tree != null && tree.size() > 0) {
+            List<ArchiveTreeContractVO2> newTrees = new ArrayList<>();
+            if (parentId == 0 && tree.size() > 1) {
+                newTrees.add(tree.get(0));
+                tree = newTrees;
+            }
             archiveTreeContractService.fillDefaultArchiveAutoInfo(tree, projectId);
             return R.data(tree);
         }