询价单被客户采纳、未采纳后消息通知的格式更新

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

@@ -540,13 +540,15 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
         List<MessageModel> models = new ArrayList<MessageModel>();
         User u = userDao.findOne(null != item.getInquiry().getRecorderUU() ? item.getInquiry().getRecorderUU() : 0L);
         Enterprise e = enterpriseDao.findOne(item.getInquiry().getEnUU());
-        String content = item.getAgreed() == 1 ? "【采纳】" : "【未采纳】" + "您关于“" + item.getCmpCode() + "”的报价";
+        String cmpCode = item.getProduct().getCmpCode() != null ? item.getProduct().getCmpCode() : item.getCmpCode();
+        String content = item.getAgreed() == 1 ? "【采纳】" : "【未采纳】";
+        content = content + "您关于“" + cmpCode + "”的报价";
         if (null != e) {
             content = e.getEnName() + content;
         } else if (null != u) {
             content = u.getUserName() + content;
-        } else {
-            content = "您关于“" + item.getCmpCode() + "”的报价已被";
+        } else if (null == e && null == u) {
+            content = "您关于“" + cmpCode + "”的报价已被";
             String result = item.getAgreed() == 1 ? "【采纳】" : "【拒绝】";
             content = content + result;
         }