From 3d4d6480a947f2f6e032b7b4b7d04c2744115ad7 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 30 十一月 2021 20:42:15 +0800
Subject: [PATCH] [update] 嚴選配對年資欄位改單純字串比對,而非用enum接

---
 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