From 636555ff3eff1dbdec352831e8ae241c5f98af94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Sat, 14 Sep 2024 17:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=88=86=E6=AF=94?=
 =?UTF-8?q?=E5=AF=B9=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarFileCompareInfoServiceImpl.java    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
index c3c35caa..1c6c3b63 100644
--- a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
@@ -26,6 +26,7 @@ import com.jero.modules.split.service.IFileSplitItemsEOService;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
 import com.jero.modules.split.service.ISarFileSplitMenuEOService;
 import com.jero.modules.system.util.MyStringUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -270,6 +271,7 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
 
     private List<SarFileCompareItem> wrapperItemList(List<SarFileSplitItemsEO> list, String infoId, Map<String, SarFileCompareMenu> menuMap, String leftOrRight) {
         List<SarFileCompareItem> resList = new ArrayList<>();
+        List<SarFileCompareItem> resNullList = new ArrayList<>();
         for (SarFileSplitItemsEO itemsEO : list) {
             SarFileCompareItem item = new SarFileCompareItem();
             item.setInfoId(infoId);
@@ -277,15 +279,23 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
             item.setMenuId(itemsEO.getMenuId());
             item.setItemsNum(itemsEO.getItemNum());
             item.setItemsText(itemsEO.getItemContent());
+            item.setLeftOrRight(leftOrRight);
+            item.setReviewed(CompareConst.NO_REVIEWED);
             SarFileCompareMenu menu = menuMap.get(itemsEO.getMenuId());
             if (menu != null) {
                 item.setItemsDisplayNum(menu.getDisplaySeq());
+                resList.add(item);
+            }else{
+                resNullList.add(item);
             }
-            item.setLeftOrRight(leftOrRight);
-            item.setReviewed(CompareConst.NO_REVIEWED);
-            resList.add(item);
+
+        }
+        if(!CollectionUtils.isEmpty(resList)){
+            resList.stream().filter(o->!Objects.isNull(o.getItemsDisplayNum())).collect(Collectors.toList());
+        }
+        if(!CollectionUtils.isEmpty(resNullList)){
+            resList.addAll(resNullList);
         }
-        Collections.sort(resList, Comparator.comparingInt(SarFileCompareItem::getItemsDisplayNum));
         return resList;
     }