瀏覽代碼

UAS商机报价报错问题处理

dongbw 7 年之前
父節點
當前提交
b8bf1f00db
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      src/main/java/com/uas/ps/inquiry/model/PublicInquiryItem.java

+ 2 - 2
src/main/java/com/uas/ps/inquiry/model/PublicInquiryItem.java

@@ -1065,9 +1065,9 @@ public class PublicInquiryItem implements Serializable {
 							&& (this.inquiry.getCheck() == null || this.inquiry.getCheck() != Constant.YES)
 							&& this.agreed == null) && this.erpstatus != Constant.NO);
 		}
-		return this.status == Status.NOT_REPLY.value() || (this.status == Status.REPLIED.value()
+		return null != this.status && (this.status == Status.NOT_REPLY.value() || (this.status == Status.REPLIED.value()
 				&& (null != this.inquiry && (this.inquiry.getCheck() == null || this.inquiry.getCheck() != Constant.YES))
-				&& this.agreed == null) && this.erpstatus != Constant.NO;
+				&& this.agreed == null) && this.erpstatus != Constant.NO);
 	}
 
     public static List<PublicInquiry> distinct(List<PublicInquiryItem> purcitems) {