diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 1ea2ce91..b92a2f4c 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -641,7 +641,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl mustValues = getMustValues2(id); valuesList.addAll(0, mustValues); String insertField = mustFields + fieldsBuilder.toString(); @@ -716,6 +716,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl buildTree(List> addItemsEOList, Long treeListDisplay, String menuId){ //排序 - Collections.sort(addItemsEOList, new Comparator>() { - @Override - public int compare(Map o1, Map o2) { - return o1.get("item_num").toString().compareTo(o2.get("item_num").toString()); - } - }); + addItemsEOList.sort(new DirectoryComparator()); List treeNodeList = new ArrayList<>(); String regex = "^[0-9]{0}([0-9]|[.])+$"; //TODO 待优化:数字和点必须交替