From c2d8465faade429e8b8f677864b0bc2da763e71c Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 23 十一月 2021 11:57:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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..23461a5 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -25,15 +25,15 @@
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("communicationStyle"), "%" + communicationStyle + "%"));
+ });
if(Objects.nonNull(param.getGender())) {
set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
}
- if(Objects.nonNull(param.getAvgScore())) {
+ if(Objects.nonNull(param.getAvgScore()) && param.getAvgScore().intValue() != 0) {
set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
}
@@ -57,7 +57,7 @@
set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
}
- if(Objects.nonNull(param.getAvgScore())) {
+ if(Objects.nonNull(param.getAvgScore()) && param.getAvgScore().intValue() != 0) {
set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
}
@@ -66,13 +66,13 @@
}
List<String> allRequirements = Objects.nonNull(param.getRequirements()) ? param.getRequirements() : new ArrayList<>();
- if(Objects.nonNull(param.getOtherRequirement())) {
+ if(StringUtils.isNotEmpty(param.getOtherPopularTags())) {
allRequirements.add(param.getOtherRequirement());
}
allRequirements.forEach(requirement -> set.add(criteriaBuilder.like(root.get("expertise"), "%" + requirement + "%")));
List<String> allPopularTags = Objects.nonNull(param.getPopularTags()) ? param.getPopularTags() : new ArrayList<>();
- if(Objects.nonNull(param.getOtherPopularTags())) {
+ if(StringUtils.isNotEmpty(param.getOtherPopularTags())) {
allPopularTags.add(param.getOtherPopularTags());
}
allPopularTags.forEach(popularTag -> set.add(criteriaBuilder.like(root.get("concept"), "%" + popularTag + "%")));
--
Gitblit v1.8.0