소스 검색

查询单个物料报价信息,增加物料id空值的判断

hejq 7 년 전
부모
커밋
adce0c401c
1개의 변경된 파일12개의 추가작업 그리고 7개의 파일을 삭제
  1. 12 7
      src/main/java/com/uas/ps/inquiry/service/impl/InquiryServiceImpl.java

+ 12 - 7
src/main/java/com/uas/ps/inquiry/service/impl/InquiryServiceImpl.java

@@ -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;