From 41daebaa3ffd0b99aac703208e4b6b2ec41c274e Mon Sep 17 00:00:00 2001
From: 劉鈞霖 <benson@gmail.com>
Date: 星期五, 19 十一月 2021 17:44:15 +0800
Subject: [PATCH] [ Update ] 修正可複選文案,將共用 css 先拉出,調整預約顧問 背景

---
 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