|
|
@@ -300,13 +300,18 @@ public class InquiryServiceImpl implements InquiryService {
|
|
|
InquiryProductInfo productInfo = new InquiryProductInfo();
|
|
|
if (!CollectionUtils.isEmpty(items)) {
|
|
|
Long prId = items.get(0).getProductId();
|
|
|
- Product product = productDao.findOne(prId);
|
|
|
- productInfo.setBrand(product.getBrand());
|
|
|
- productInfo.setCode(product.getCode());
|
|
|
- productInfo.setTitle(product.getTitle());
|
|
|
- productInfo.setSpec(product.getSpec());
|
|
|
- productInfo.setUnit(product.getUnit());
|
|
|
- productInfo.setCmpCode(productInfo.getCmpCode());
|
|
|
+ if (null != prId) {
|
|
|
+ Product product = productDao.findOne(prId);
|
|
|
+ productInfo.setBrand(product.getBrand());
|
|
|
+ productInfo.setCode(product.getCode());
|
|
|
+ productInfo.setTitle(product.getTitle());
|
|
|
+ productInfo.setSpec(product.getSpec());
|
|
|
+ productInfo.setUnit(product.getUnit());
|
|
|
+ productInfo.setCmpCode(product.getCmpCode());
|
|
|
+ } else {
|
|
|
+ productInfo.setCmpCode(items.get(0).getCmpCode());
|
|
|
+ productInfo.setBrand(items.get(0).getInbrand());
|
|
|
+ }
|
|
|
productInfo.setInquiryItems(new HashSet<PublicInquiryItem>(items));
|
|
|
}
|
|
|
return productInfo;
|