From a9556593ae9a6227fe4612f2805c970cc4390ede Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期二, 30 十一月 2021 10:34:01 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 4 ++--
pamapi/src/main/java/com/pollex/pam/repository/LoginRecordRepository.java | 2 +-
pamapi/src/main/java/com/pollex/pam/service/LoginRecordService.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/repository/LoginRecordRepository.java b/pamapi/src/main/java/com/pollex/pam/repository/LoginRecordRepository.java
index 525ee85..6d8f3ab 100644
--- a/pamapi/src/main/java/com/pollex/pam/repository/LoginRecordRepository.java
+++ b/pamapi/src/main/java/com/pollex/pam/repository/LoginRecordRepository.java
@@ -9,5 +9,5 @@
@Repository
public interface LoginRecordRepository extends JpaRepository<LoginRecord, Long> {
- Optional<LoginRecord> findTopByAccountAndResultOrderByLoginDate(String account, LoginResult loginResult);
+ Optional<LoginRecord> findTopByAccountAndResultOrderByLoginDateDesc(String account, LoginResult loginResult);
}
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 45f936f..33ac5cf 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -31,7 +31,7 @@
}
if(Objects.nonNull(param.getAvgScore()) && param.getAvgScore().intValue() != 0) {
- set.add(criteriaBuilder.equal(root.get("avgScore"), param.getAvgScore()));
+ set.add(criteriaBuilder.greaterThanOrEqualTo(root.get("avgScore"), param.getAvgScore().intValue()));
}
Predicate[] predicates = new Predicate[set.size()];
@@ -55,7 +55,7 @@
}
if(Objects.nonNull(param.getAvgScore()) && param.getAvgScore().intValue() != 0) {
- set.add(criteriaBuilder.equal(root.get("avgScore"), param.getAvgScore()));
+ set.add(criteriaBuilder.greaterThanOrEqualTo(root.get("avgScore"), param.getAvgScore().intValue()));
}
if(StringUtils.isNotEmpty(param.getArea())) {
diff --git a/pamapi/src/main/java/com/pollex/pam/service/LoginRecordService.java b/pamapi/src/main/java/com/pollex/pam/service/LoginRecordService.java
index 2bbb169..8c0b8c4 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/LoginRecordService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/LoginRecordService.java
@@ -23,7 +23,7 @@
LoginRecordRepository loginRecordRepository;
public Optional<LoginRecord> findLatestLoginRecord(String account, LoginResult loginResult) {
- return loginRecordRepository.findTopByAccountAndResultOrderByLoginDate(account, loginResult);
+ return loginRecordRepository.findTopByAccountAndResultOrderByLoginDateDesc(account, loginResult);
}
public void saveOTPLoginSuccessRecord(String account) {
--
Gitblit v1.8.0