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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 c55ffe3..23461a5 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -26,7 +26,7 @@
Set<Predicate> set = new HashSet<>();
param.getCommunicationStyles().forEach((communicationStyle) -> {
- set.add(criteriaBuilder.like(root.get("concept"), "%" + param.getCommunicationStyles() + "%"));
+ set.add(criteriaBuilder.like(root.get("communicationStyle"), "%" + communicationStyle + "%"));
});
if(Objects.nonNull(param.getGender())) {
@@ -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