From 55bfb3e3ac2cea5443320dfea61a0ed153bb4e84 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期五, 12 十一月 2021 16:16:28 +0800 Subject: [PATCH] [add] todo#126591: e-service, otp登入流程 --- 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