盘点表设计、分页搭建

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/doc/util/BionutritionDocUtil.java

@@ -2,6 +2,7 @@ package com.ruoyi.ams.bionutrition.doc.util;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.google.common.collect.Lists;
 import com.ruoyi.ams.bionutrition.doc.dto.BionutritionDocBaseDTO;
 import com.ruoyi.ams.bionutrition.doc.dto.BionutritionDocDetailsDTO;
 import com.ruoyi.ams.bionutrition.doc.dto.BionutritionDocHeaderDTO;
@@ -72,19 +73,10 @@ public class BionutritionDocUtil {
      */
     @SneakyThrows
     public static <E extends BionutritionDocDetailsBaseDTO> List<E> buildBionutritionDocDetailsDTOList(String docType, List<BionutritionDocDetailsDTO> bionutritionDocDetailsDTOList) {
-        /*Assert.isTrue(StringUtils.isNotBlank(docType), "docType is null");
+        Assert.isTrue(StringUtils.isNotBlank(docType), "docType is null");
         return CollectionUtil.isNotEmpty(bionutritionDocDetailsDTOList) ?
                 bionutritionDocDetailsDTOList.stream().map(item -> (E) buildBionutritionDocDetailsDTO(docType, item)).collect(Collectors.toList()) :
-                buildBionutritionDocDetailsDTO(docType, new BionutritionDocDetailsDTO());*/
-        if (CollectionUtil.isNotEmpty(bionutritionDocDetailsDTOList)){
-            Assert.isTrue(StringUtils.isNotBlank(docType), "docType is null");
-            return bionutritionDocDetailsDTOList.stream().map(item -> (E) buildBionutritionDocDetailsDTO(docType, item)).collect(Collectors.toList());
-        } else {
-            List<E> docDetailsDTOList = new ArrayList<>();
-            E docDetailsBaseDTO = buildBionutritionDocDetailsDTO(docType, new BionutritionDocDetailsDTO());
-            docDetailsDTOList.add(docDetailsBaseDTO);
-            return docDetailsDTOList;
-        }
+                Lists.newArrayList((E) buildBionutritionDocDetailsDTO(docType, new BionutritionDocDetailsDTO()));
     }
 
     /**