|
|
@@ -465,7 +465,7 @@ public class InquiryServiceImpl implements InquiryService {
|
|
|
public Page<PurcInquiryItemInfo> findQuotationsByPage(final PageInfo pageInfo, final SearchFilter filter) {
|
|
|
if (StringUtils.hasText(filter.getKeyword())) {
|
|
|
SimpleExpression cmpCode = new SimpleExpression("cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE);
|
|
|
- SimpleExpression inbrand = new SimpleExpression("inbrand", Constant.NO, CriterionExpression.Operator.GT);
|
|
|
+ SimpleExpression inbrand = new SimpleExpression("inbrand", filter.getKeyword(), CriterionExpression.Operator.LIKE);
|
|
|
SimpleExpression[] simpleExpressions = new SimpleExpression[]{inbrand, cmpCode};
|
|
|
LogicalExpression logicalExpression = PredicateUtils.or(simpleExpressions);
|
|
|
pageInfo.expression(logicalExpression);
|