|
|
@@ -68,7 +68,7 @@ public class PurchaseInquiryDetailServiceImpl implements PurchaseInquiryDetailSe
|
|
|
// 未回复客户已提交
|
|
|
SimpleExpression check = new SimpleExpression("inquiry.check", Constant.YES, CriterionExpression.Operator.EQ, true);
|
|
|
SimpleExpression[] checkExpressions = new SimpleExpression[]{check, notReply};
|
|
|
- LogicalExpression checkedAndNotReply = new LogicalExpression(checkExpressions, CriterionExpression.Operator.OR);
|
|
|
+ LogicalExpression checkedAndNotReply = new LogicalExpression(checkExpressions, CriterionExpression.Operator.AND);
|
|
|
pageInfo.expression(PredicateUtils.or(logical, overdueAndNotReply, checkedAndNotReply));
|
|
|
return findByPageInfo(pageInfo, keyword, filter);
|
|
|
}
|