|
|
@@ -490,7 +490,8 @@ public class ProductServiceImpl implements ProductService {
|
|
|
for (V_ProductPrivate product : productList) {
|
|
|
List<Goods> goodsList = goodsDao.findByProductIdOrderByGoodsId(product.getId());
|
|
|
if (!CollectionUtils.isEmpty(goodsList)) {
|
|
|
- resultList.addAll(goodsList);
|
|
|
+ //目前现在一颗物料只能存在一个在售产品,目前取id最大的在售产品信息
|
|
|
+ resultList.add(goodsList.get(0));
|
|
|
} else {
|
|
|
Goods g = Goods.productConvertGoods(product);
|
|
|
resultList.add(g);
|