修改测试bug

enterprise-manager/src/main/java/com/mortals/xhx/module/product/service/impl/ProductServiceImpl.java

@@ -72,6 +72,7 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
             if (!ObjectUtils.isEmpty(entity.getCategoryId()) && ObjectUtils.isEmpty(entity.getCompanyId())) {
                 Result<ProductCategoryEntity> productCategoryResult = productCategoryService.find(new ProductCategoryQuery().categoryId(Long.parseLong(entity.getCategoryId())), pageInfo, context);
                 List<ProductEntity> productList = getProductEntitiesByCategory(entity, productCategoryResult);
+                productList = productList.stream().filter(Objects::nonNull).collect(Collectors.toList());
                 if (!ObjectUtils.isEmpty(hot)) {
                     //过滤热门与非热门
                     productList = productList.stream().filter(f -> f.getHot() == hot).collect(Collectors.toList());
@@ -88,6 +89,7 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
                 Result<CompanyProductEntity> companyProductEntityResult = companyProductService.find(new CompanyProductQuery().companyId(Long.parseLong(entity.getCompanyId())), pageInfo, context);
                 List<CompanyProductEntity> companyProducList = companyProductEntityResult.getList();
                 List<ProductEntity> productList = getProductEntitiesByCompanyId(entity, companyProducList);
+                productList = productList.stream().filter(Objects::nonNull).collect(Collectors.toList());
                 if (!ObjectUtils.isEmpty(hot)) {
                     //过滤热门与非热门
                     productList = productList.stream().filter(f -> f.getHot() == hot).collect(Collectors.toList());
@@ -109,6 +111,7 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
 
                 //求2个list的交集
                 List<ProductEntity> collect = CollUtil.intersection(productCategoryList, productCompanyList).stream().collect(Collectors.toList());
+                collect = collect.stream().filter(Objects::nonNull).collect(Collectors.toList());
                 if (!ObjectUtils.isEmpty(hot)) {
                     //过滤热门与非热门
                     collect = collect.stream().filter(f -> f.getHot() == hot).collect(Collectors.toList());
@@ -158,6 +161,7 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
                 }
             });
         }
+        productList = productList.stream().filter(Objects::nonNull).collect(Collectors.toList());
         productList = productList.stream().filter(f -> f.getShelves() == 1).collect(Collectors.toList());
         productList = productList.stream().sorted(Comparator.comparing(ProductEntity::getPublishTime).reversed())
                 .collect(Collectors.toList());