|
|
@@ -338,8 +338,10 @@ public class BillSubmitServiceImpl implements BillSubmitService {
|
|
|
SimpleExpression orderids = new SimpleExpression("orderids", keyword, CriterionExpression.Operator.LIKE);
|
|
|
SimpleExpression invoicetitle = new SimpleExpression("invoicetitle", keyword, CriterionExpression.Operator.LIKE);
|
|
|
SimpleExpression receiverName = new SimpleExpression("receiverName", keyword, CriterionExpression.Operator.LIKE);
|
|
|
+ SimpleExpression submiterName = new SimpleExpression("submiter.userName", keyword, CriterionExpression.Operator.LIKE);
|
|
|
+ SimpleExpression submitEnterpriseName = new SimpleExpression("submitEnterprise.enName", keyword, CriterionExpression.Operator.LIKE);
|
|
|
SimpleExpression recTel = new SimpleExpression("recTel", keyword, CriterionExpression.Operator.LIKE);
|
|
|
- SimpleExpression[] simpleExpressions = new SimpleExpression[]{sellername, orderids, invoicetitle, receiverName, recTel};
|
|
|
+ SimpleExpression[] simpleExpressions = new SimpleExpression[]{sellername, orderids, invoicetitle, receiverName, recTel, submiterName, submitEnterpriseName};
|
|
|
LogicalExpression logicalExpression = PredicateUtils.or(simpleExpressions);
|
|
|
pageInfo.expression(logicalExpression);
|
|
|
}
|