保誠-保戶業務員媒合平台
Mila
2021-11-30 a9556593ae9a6227fe4612f2805c970cc4390ede
Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
修改3個檔案
8 ■■■■ 已變更過的檔案
pamapi/src/main/java/com/pollex/pam/repository/LoginRecordRepository.java 2 ●●● 修補檔 | 檢視 | 原始 | 究查 | 歷程
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java 4 ●●●● 修補檔 | 檢視 | 原始 | 究查 | 歷程
pamapi/src/main/java/com/pollex/pam/service/LoginRecordService.java 2 ●●● 修補檔 | 檢視 | 原始 | 究查 | 歷程
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);
}
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())) {
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) {