diff --git a/src/main/java/com/doubleo/logservice/domain/log/service/LogServiceImpl.java b/src/main/java/com/doubleo/logservice/domain/log/service/LogServiceImpl.java index bfce0d8..6d6b9fa 100644 --- a/src/main/java/com/doubleo/logservice/domain/log/service/LogServiceImpl.java +++ b/src/main/java/com/doubleo/logservice/domain/log/service/LogServiceImpl.java @@ -19,7 +19,9 @@ import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -40,6 +42,13 @@ public class LogServiceImpl implements LogService { @Override public Page getAllIssuedLog(String keyword, Pageable pageable) { String tenantId = tenantValidator.getTenantId(); + + pageable = + PageRequest.of( + pageable.getPageNumber(), + pageable.getPageSize(), + Sort.by(Sort.Direction.DESC, "createdDt")); + Page issuedLogs; if (keyword == null || keyword.isBlank()) { issuedLogs = issuedLogRepository.findAllByTenantId(tenantId, pageable); @@ -79,6 +88,13 @@ public Page getAllIssuedLog(String keyword, Pageable pageable @Override public Page getAllEnterLog(String keyword, Pageable pageable) { String tenantId = tenantValidator.getTenantId(); + + pageable = + PageRequest.of( + pageable.getPageNumber(), + pageable.getPageSize(), + Sort.by(Sort.Direction.DESC, "createdDt")); + Page enterLogs; if (keyword == null || keyword.isBlank()) { enterLogs = enterLogRepository.findAllByTenantId(tenantId, pageable);