测试bug修改

enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/ProductApiController.java

@@ -85,7 +85,7 @@ public class ProductApiController extends AbstractBaseController<ProductReq>{
                 query.setCategoryId(String.valueOf(productReq.getCategoryId()));
             }
             query.setHot(productReq.getHot());
-            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("publishTime", OrderCol.DESCENDING)));
             Result<ProductEntity> result = productService.find(query, pageInfo, context);
             List<ProductEntity> collect = result.getList().stream().map(item -> {
                 ProductEntity productEntity = new ProductEntity();

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

@@ -139,16 +139,19 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
     public List<ProductEntity> getProductEntitiesByCompanyId(ProductEntity entity, List<CompanyProductEntity> companyProducList) {
         List<ProductEntity> productList = new ArrayList<>();
         if(CollectionUtils.isNotEmpty(companyProducList)){
+            List<ProductEntity> finalProductList = productList;
             companyProducList.forEach(item->{
                 ProductEntity productEntity = this.getCache(item.getProductId().toString());
                 if (!ObjectUtils.isEmpty(productEntity)) {
                     productEntity.setCompanyId(entity.getCompanyId());
                     String categoryIds = productCategoryService.find(new ProductCategoryQuery().productId(item.getId())).stream().map(i -> i.getCategoryId().toString()).collect(Collectors.joining(","));
                     productEntity.setCategoryId(categoryIds);
-                    productList.add(productEntity);
+                    finalProductList.add(productEntity);
                 }
             });
         }
+        productList = productList.stream().sorted(Comparator.comparing(ProductEntity::getPublishTime).reversed())
+                .collect(Collectors.toList());
         return productList;
     }