From 4400820b75440188f463f87e0b91564b88b512b4 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 17 十二月 2021 16:13:36 +0800
Subject: [PATCH] Merge branch '簡訊與信箱'
---
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 3163411..dda2ade 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -9,7 +9,7 @@
import javax.persistence.criteria.*;
import java.util.*;
-import static com.pollex.pam.enums.SeniorityQueryEnum.*;
+import static com.pollex.pam.consts.SeniorityQueryConst.*;
public class ConsultantQuerySpec {
private ConsultantQuerySpec() {
@@ -60,11 +60,11 @@
set.add(criteriaBuilder.greaterThanOrEqualTo(root.get("avgScore"), param.getAvgScore().intValue()));
}
- if(Objects.nonNull(param.getSeniority()) && param.getSeniority() != UNLIMITED) {
- if(param.getSeniority() == YOUNG) {
+ if(StringUtils.isNotEmpty(param.getSeniority()) && !StringUtils.equals(UNLIMITED, param.getSeniority())) {
+ if(YOUNG.equals(param.getSeniority())) {
set.add(criteriaBuilder.lessThanOrEqualTo(root.get("seniorityYear"), 5));
}
- else if(param.getSeniority() == SENIOR) {
+ else if(SENIOR.equals(param.getSeniority())) {
set.add(criteriaBuilder.greaterThan(root.get("seniorityYear"), 5));
}
}
--
Gitblit v1.8.0