Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
| | |
| | | |
| | | @Repository |
| | | public interface LoginRecordRepository extends JpaRepository<LoginRecord, Long> { |
| | | Optional<LoginRecord> findTopByAccountAndResultOrderByLoginDate(String account, LoginResult loginResult); |
| | | Optional<LoginRecord> findTopByAccountAndResultOrderByLoginDateDesc(String account, LoginResult loginResult); |
| | | } |
| | |
| | | } |
| | | |
| | | 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()]; |
| | |
| | | } |
| | | |
| | | 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())) { |
| | |
| | | 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) { |