Browse Source

处理报价个人账户发起的询价单时空指针异常的问题。

dongbw 7 years ago
parent
commit
98d0bf3e7d

+ 2 - 2
src/main/java/com/uas/ps/inquiry/service/impl/InquiryForSaleServiceImpl.java

@@ -779,7 +779,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
             result.put("message", "找不到当前公共询价");
             return true;
         }
-        if (item.getInquiry() != null && item.getInquiry().getEnUU().equals(publicInquiryItem.getVendUU())) {
+        if (item.getInquiry() != null && publicInquiryItem.getVendUU().equals(item.getInquiry().getEnUU())) {
             result.put("message", "不能对自己单据进行报价");
             return true;
         }
@@ -855,7 +855,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
             }
             // 转报价后 主表信息保存
             inquiry = new PublicInquiry(item.getInquiry());
-            if (null == inquiry.getEnName()) {
+            if (null == inquiry.getEnName() && null != inquiry.getEnUU()) {
                 Enterprise e = enterpriseDao.findOne(inquiry.getEnUU());
                 inquiry.setEnName(e.getEnName());
             }