保誠-保戶業務員媒合平台
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -26,20 +26,20 @@
                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())) {
                    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));
                }
                Predicate[] predicates = new Predicate[set.size()];
                predicates = set.toArray(predicates);
                return criteriaBuilder.or(predicates);
                return criteriaBuilder.and(predicates);
            }
        };
    }
@@ -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 + "%")));