From 47c5ce77b114324effdce5b3735ed0e661846108 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 06 1월 2022 10:58:23 +0900 Subject: [PATCH] - 이슈 상세페이지 연관,하위 이슈 페이징 처리 --- src/main/java/kr/wisestone/owl/util/PageUtil.java | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/util/PageUtil.java b/src/main/java/kr/wisestone/owl/util/PageUtil.java index 6d78294..ee91b1b 100644 --- a/src/main/java/kr/wisestone/owl/util/PageUtil.java +++ b/src/main/java/kr/wisestone/owl/util/PageUtil.java @@ -28,17 +28,31 @@ } if (pageVo.getPage() == null || pageVo.getPage() < 0) { - throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.PAGE_NEGATIVE_OR_NULL)); + if (pageVo.getRelPage() == null || pageVo.getRelPage() < 0 + || pageVo.getDownPage() == null || pageVo.getDownPage() < 0) { + throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.PAGE_NEGATIVE_OR_NULL)); + } } if (pageVo.getPageSize() == null || pageVo.getPageSize() < 0) { - throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.PAGE_SIZE_NEGATIVE_OR_NULL)); + if (pageVo.getRelPageSize() == null || pageVo.getRelPageSize() < 0 + || pageVo.getDownPageSize() == null || pageVo.getDownPageSize() < 0) { + throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.PAGE_SIZE_NEGATIVE_OR_NULL)); + } } } public Pageable convertPageable(PageVo pageVo) { return PageRequest.of(pageVo.getPage(), pageVo.getPageSize()); } + + public Pageable convertRelPageable(PageVo pageVo) { + return PageRequest.of(pageVo.getRelPage(), pageVo.getRelPageSize()); + } + + public Pageable convertDownPageable(PageVo pageVo) { + return PageRequest.of(pageVo.getDownPage(), pageVo.getDownPageSize()); + } public Pageable getDefaultPageable() { return PageRequest.of(0, 300); @@ -49,7 +63,7 @@ } public PageVo getDefaultPageVo() { - return new PageVo(0, 300); + return new PageVo(0, 300,0, 300, 0, 300); } public static Pageable applySort(Pageable page, String field, Sort.Direction direction) { -- Gitblit v1.8.0