页数不是必填可能为null

inet-doc-expand-core/src/main/java/com/inet/dcs/document/core/service/impl/ExtTransferDocumentServiceImpl.java

@@ -39,7 +39,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -306,6 +305,10 @@ public class ExtTransferDocumentServiceImpl<V extends ExtTransferDocumentVO> imp
                             .item(new SearchItem("belongingCaseFile", SearchItem.Operator.EQ, volumeNumber, null))
                             .operator(SearchItems.BooleanOperator.AND).build()).build();
             List<ExtTransferDocLinkVO> extTransferDocLinkVOList = extTransferDocLinkService.findRecursion(queryDoc).getContent();
+            extTransferDocLinkVOList = extTransferDocLinkVOList.stream().filter(obj ->
+                    !obj.getSource().getArchivingStatus().equals(ExtDxDocumentServiceImpl.ARCHIVE_INVALIDATED)
+                            && !obj.getSource().getArchivingStatus().equals(ExtDxDocumentServiceImpl.ARCHIVE_NOT_RECEIVED))
+                    .collect(Collectors.toList());
 
             for (ExtTransferDocLinkVO extTransferDocLinkVO : extTransferDocLinkVOList) {
                 // 最大密级
@@ -322,7 +325,8 @@ public class ExtTransferDocumentServiceImpl<V extends ExtTransferDocumentVO> imp
                     storagePeriodDictSeq = storagePeriodDocMax.getDictSeq();
                     storagePeriod = storagePeriodDocMax.getDictKey();
                 }
-                pageNumber += extTransferDocLinkVO.getPageNumber();
+
+                pageNumber += extTransferDocLinkVO.getPageNumber() == null ? 0 : extTransferDocLinkVO.getPageNumber();
             }
 
             ExtFilesUpdateVO filesUpdateVO = new ExtFilesUpdateVO();