Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/ps/inquiry/service/impl/InquiryServiceImpl.java

@@ -231,8 +231,27 @@ public class InquiryServiceImpl implements InquiryService {
             Set<InquiryProductInfo> products = new HashSet<InquiryProductInfo>();
             if (!CollectionUtils.isEmpty(inquiry.getInquiryItems())) {
                 for (PublicInquiryItem item : inquiry.getInquiryItems()) {
-                    idList.add(item.getProductId());
-                    ids.addAll(idList);
+                    if (item.getProductId() != null) {
+                        idList.add(item.getProductId());
+                        ids.addAll(idList);
+                    } else {
+                        InquiryProductInfo productInfo = new InquiryProductInfo();
+                        Set<PublicInquiryItem> items = new HashSet<PublicInquiryItem>();
+                        productInfo.setBrand(item.getBrand());
+                        productInfo.setSpec(item.getSpec());
+                        productInfo.setCode(item.getProdCode());
+                        productInfo.setTitle(item.getProdTitle());
+                        productInfo.setUnit(item.getUnit());
+                        productInfo.setCmpCode(item.getCmpCode());
+                        products.add(productInfo);
+                        for (PublicInquiryItem item1 : inquiry.getInquiryItems()) {
+                             if (item1.getCmpCode() != null && item1.getCmpCode().equals(productInfo.getCmpCode())) {
+                                items.add(item1);
+                            }
+                        }
+                        productInfo.setInquiryItems(items);
+                        inquiryInfo.setProducts(products);
+                    }
                 }
             }
             if (!CollectionUtils.isEmpty(ids)) {