From 6f3021e865c2b0503dda227477084fa586e6fd8f Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期二, 16 十一月 2021 21:02:44 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
index 986591e..23461a5 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -39,7 +39,7 @@
Predicate[] predicates = new Predicate[set.size()];
predicates = set.toArray(predicates);
- return criteriaBuilder.or(predicates);
+ return criteriaBuilder.and(predicates);
}
};
}
--
Gitblit v1.8.0