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 wrapperItemList(List list, String infoId, Map menuMap, String leftOrRight) { List resList = new ArrayList<>(); + List resNullList = new ArrayList<>(); for (SarFileSplitItemsEO itemsEO : list) { SarFileCompareItem item = new SarFileCompareItem(); item.setInfoId(infoId); @@ -277,15 +279,23 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl!Objects.isNull(o.getItemsDisplayNum())).collect(Collectors.toList()); + } + if(!CollectionUtils.isEmpty(resNullList)){ + resList.addAll(resNullList); } - Collections.sort(resList, Comparator.comparingInt(SarFileCompareItem::getItemsDisplayNum)); return resList; }