fix(87776): 文档拆分--导入拆分结果--排序不正确

laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java

@@ -641,7 +641,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
 
             fieldsBuilder.append("," + key);
         }
-        String mustFields = "id,create_by,create_time,update_by,update_time,sys_org_code";
+        String mustFields = "id,create_by,create_time,update_by,update_time,sys_org_code,is_same_as_prev_version";
         List<String> mustValues = getMustValues2(id);
         valuesList.addAll(0, mustValues);
         String insertField = mustFields + fieldsBuilder.toString();
@@ -716,6 +716,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         list.add(sysUser.getUsername());
         list.add(sdf.format(new Date()));
         list.add(sysUser.getOrgCode());
+        list.add("");
         return list;
     }
 
@@ -2999,12 +3000,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
      */
     private List<SarFileSplitMenuTreeNode> buildTree(List<Map<String, Object>> addItemsEOList, Long treeListDisplay, String menuId){
         //排序
-        Collections.sort(addItemsEOList, new Comparator<Map<String, Object>>() {
+        addItemsEOList.sort(new DirectoryComparator());
-            @Override
-            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
-                return o1.get("item_num").toString().compareTo(o2.get("item_num").toString());
-            }
-        });
 
         List<SarFileSplitMenuTreeNode> treeNodeList = new ArrayList<>();
         String regex = "^[0-9]{0}([0-9]|[.])+$"; //TODO 待优化：数字和点必须交替