浏览代码

bom求购记录查询修改

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

+ 8 - 4
src/main/java/com/uas/ps/inquiry/service/impl/InquiryServiceImpl.java

@@ -657,12 +657,16 @@ public class InquiryServiceImpl implements InquiryService {
             info.setPageSize(5);
         }
         info.setSort(sort);
+        if (null == filter.getUserUU() && null == filter.getEnUU()) {
+            throw new IllegalAccessError("非法访问");
+        }
         if (null != filter.getUserUU()) {
-            info.filter("recorderUU", filter.getUserUU());
-        } else if (null != filter.getEnUU()) {
-            info.filter("enUU", filter.getEnUU());
+            info.expression(PredicateUtils.eq("recorderUU", filter.getUserUU(), false));
+        }
+        if (null != filter.getEnUU()) {
+            info.expression(PredicateUtils.eq("enUU", filter.getEnUU(), false));
         } else {
-            throw new IllegalAccessError("非法访问");
+            info.expression(PredicateUtils.isNull("enUU"));
         }
         if (null != filter) {
             if (!StringUtils.isEmpty(filter.getKeyword())) {