|
|
@@ -177,7 +177,8 @@ public class InquiryServiceImpl implements InquiryService {
|
|
|
if (StringUtils.hasText(filter.getKeyword())) {
|
|
|
SimpleExpression cmpCode = new SimpleExpression("cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE);
|
|
|
SimpleExpression brand = new SimpleExpression("inbrand", filter.getKeyword(), CriterionExpression.Operator.LIKE);
|
|
|
- SimpleExpression[] simpleExpressions = new SimpleExpression[]{cmpCode, brand};
|
|
|
+ SimpleExpression prodTitle = new SimpleExpression("prodTitle", filter.getKeyword(), CriterionExpression.Operator.LIKE);
|
|
|
+ SimpleExpression[] simpleExpressions = new SimpleExpression[]{cmpCode, brand, prodTitle};
|
|
|
LogicalExpression logicalExpression = PredicateUtils.or(simpleExpressions);
|
|
|
info.expression(logicalExpression);
|
|
|
}
|
|
|
@@ -574,7 +575,7 @@ public class InquiryServiceImpl implements InquiryService {
|
|
|
} else {
|
|
|
InquiryProductInfo productInfo = new InquiryProductInfo();
|
|
|
Set<PublicInquiryItem> items = new HashSet<PublicInquiryItem>();
|
|
|
- productInfo.setBrand(item.getBrand());
|
|
|
+ productInfo.setBrand(item.getInbrand());
|
|
|
productInfo.setSpec(item.getSpec());
|
|
|
productInfo.setCode(item.getProdCode());
|
|
|
productInfo.setTitle(item.getProdTitle());
|