From e3a295496de4d8c16d0b9d0d3f71e65fc8dfa8f8 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期三, 10 十一月 2021 12:06:59 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 68f4d9e..bd8c3d7 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -25,9 +25,9 @@
public Predicate toPredicate(Root<Consultant> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
Set<Predicate> set = new HashSet<>();
- if(StringUtils.isNotEmpty(param.getCommunicationStyle())) {
- set.add(criteriaBuilder.like(root.get("concept"), "%" + param.getCommunicationStyle()));
- }
+ param.getCommunicationStyles().forEach((communicationStyle) -> {
+ set.add(criteriaBuilder.like(root.get("concept"), "%" + param.getCommunicationStyles()));
+ });
if(Objects.nonNull(param.getGender())) {
set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
@@ -39,7 +39,7 @@
Predicate[] predicates = new Predicate[set.size()];
predicates = set.toArray(predicates);
- return criteriaBuilder.and(predicates);
+ return criteriaBuilder.or(predicates);
}
};
}
--
Gitblit v1.8.0