保誠-保戶業務員媒合平台
wayne
2021-11-25 e28415e8f6d76ddcf0c936027669c22ed2b2e05d
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())) {
@@ -34,12 +34,12 @@
                }
                if(Objects.nonNull(param.getAvgScore()) && param.getAvgScore().intValue() != 0) {
                    set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
                    set.add(criteriaBuilder.equal(root.get("avgScore"), param.getAvgScore()));
                }
                Predicate[] predicates = new Predicate[set.size()];
                predicates = set.toArray(predicates);
                return criteriaBuilder.or(predicates);
                return criteriaBuilder.and(predicates);
            }
        };
    }
@@ -58,7 +58,7 @@
                }
                if(Objects.nonNull(param.getAvgScore()) && param.getAvgScore().intValue() != 0) {
                    set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
                    set.add(criteriaBuilder.equal(root.get("avgScore"), param.getAvgScore()));
                }
                if(StringUtils.isNotEmpty(param.getArea())) {