Showing
1 changed file
with
4 additions
and
4 deletions
@@ -2026,7 +2026,7 @@ public class ProductServiceImpl implements ProductService { | @@ -2026,7 +2026,7 @@ public class ProductServiceImpl implements ProductService { | ||
2026 | Map<String, List<GoodsBO>> tabs = new HashMap<>(); | 2026 | Map<String, List<GoodsBO>> tabs = new HashMap<>(); |
2027 | tabs.put("goods_list", Arrays.asList(goodsBO)); | 2027 | tabs.put("goods_list", Arrays.asList(goodsBO)); |
2028 | tabs.put("pre_sale_goods_list", Arrays.asList(preSaleGoodsBO)); | 2028 | tabs.put("pre_sale_goods_list", Arrays.asList(preSaleGoodsBO)); |
2029 | - tabs.put("seconds_goods_list", Arrays.asList(goodsBO)); | 2029 | + tabs.put("seconds_goods_list", Arrays.asList(secondsGoodsBO)); |
2030 | product_info.setGoodsListTabs(tabs); | 2030 | product_info.setGoodsListTabs(tabs); |
2031 | product_info.setGoodsList(null); | 2031 | product_info.setGoodsList(null); |
2032 | } | 2032 | } |
@@ -2133,9 +2133,9 @@ public class ProductServiceImpl implements ProductService { | @@ -2133,9 +2133,9 @@ public class ProductServiceImpl implements ProductService { | ||
2133 | } | 2133 | } |
2134 | return sp2; | 2134 | return sp2; |
2135 | } | 2135 | } |
2136 | - private boolean notAllNull(Object... obj) { | ||
2137 | - for (Object o : obj) { | ||
2138 | - if (o != null) { | 2136 | + private boolean notAllNull(Integer... numbers) { |
2137 | + for (Integer n : numbers) { | ||
2138 | + if (n != null && n > 0) { | ||
2139 | return true; | 2139 | return true; |
2140 | } | 2140 | } |
2141 | } | 2141 | } |
-
Please register or login to post a comment