|
|
@@ -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) {
|