From 7661b16bc6cd41f084075a8e9471fc0f0a61e48c Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 31 Jul 2024 10:35:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(87776):=20=E6=96=87=E6=A1=A3=E6=8B=86?=
 =?UTF-8?q?=E5=88=86--=E5=AF=BC=E5=85=A5=E6=8B=86=E5=88=86=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C--=E6=8E=92=E5=BA=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FileSplitItemsEOServiceImpl.java      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

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<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>>() {
-            @Override
-            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
-                return o1.get("item_num").toString().compareTo(o2.get("item_num").toString());
-            }
-        });
+        addItemsEOList.sort(new DirectoryComparator());
 
         List<SarFileSplitMenuTreeNode> treeNodeList = new ArrayList<>();
         String regex = "^[0-9]{0}([0-9]|[.])+$"; //TODO 待优化：数字和点必须交替