bom求购记录查询修改

src/main/java/com/uas/ps/inquiry/service/impl/InquiryServiceImpl.java

@@ -657,6 +657,9 @@ public class InquiryServiceImpl implements InquiryService {
             info.setPageSize(5);
         }
         info.setSort(sort);
+        if (null == filter) {
+            throw new IllegalOperatorException("未传入过滤条件");
+        }
         if (null == filter.getUserUU() && null == filter.getEnUU()) {
             throw new IllegalAccessError("非法访问");
         }
@@ -668,19 +671,17 @@ public class InquiryServiceImpl implements InquiryService {
         } else {
             info.expression(PredicateUtils.isNull("enUU"));
         }
-        if (null != filter) {
-            if (!StringUtils.isEmpty(filter.getKeyword())) {
-                SimpleExpression code = new SimpleExpression("remark", filter.getKeyword(), CriterionExpression.Operator.LIKE);
-                SimpleExpression[] simpleExpressions = new SimpleExpression[]{code};
-                LogicalExpression logicalExpression = PredicateUtils.or(simpleExpressions);
-                info.expression(logicalExpression);
-            }
-            if (filter.getFromDate() != null) {
-                info.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
-            }
-            if (filter.getEndDate() != null) {
-                info.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
-            }
+        if (!StringUtils.isEmpty(filter.getKeyword())) {
+            SimpleExpression code = new SimpleExpression("remark", filter.getKeyword(), CriterionExpression.Operator.LIKE);
+            SimpleExpression[] simpleExpressions = new SimpleExpression[]{code};
+            LogicalExpression logicalExpression = PredicateUtils.or(simpleExpressions);
+            info.expression(logicalExpression);
+        }
+        if (filter.getFromDate() != null) {
+            info.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
+        }
+        if (filter.getEndDate() != null) {
+            info.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
         }
         SimpleExpression amount = new SimpleExpression("amount", Constant.YES, CriterionExpression.Operator.GT);
         SimpleExpression[] simpleExpressions = new SimpleExpression[]{amount};