浏览代码

搜索询价单方法修改

dongbw 7 年之前
父节点
当前提交
9ee51efb2f
共有 1 个文件被更改,包括 1 次插入9 次删除
  1. 1 9
      src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

+ 1 - 9
src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -1294,15 +1294,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                 SimpleExpression cmpCode = new SimpleExpression("cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
                 SimpleExpression brand = new SimpleExpression("inbrand", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
                 SimpleExpression title = new SimpleExpression("prodTitle", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
-                SimpleExpression spec = new SimpleExpression("spec", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
-                SimpleExpression code = new SimpleExpression("inquiry.code", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
-                SimpleExpression enName = new SimpleExpression("inquiry.enName", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
-                SimpleExpression[] simpleExpressions = null;
-                if (!StringUtils.isEmpty(filter.getIsLogin()) && filter.getIsLogin() == 0) {
-                    simpleExpressions = new SimpleExpression[]{cmpCode, brand, code, title, spec};
-                } else {
-                    simpleExpressions = new SimpleExpression[]{cmpCode, brand, code, title, enName, spec};
-                }
+                SimpleExpression[] simpleExpressions = new SimpleExpression[]{cmpCode, brand, title};
                 LogicalExpression logical = new LogicalExpression(simpleExpressions, CriterionExpression.Operator.OR);
                 info.expression(logical);
             }