diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java index fa8aa72..ac14041 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java @@ -597,10 +597,9 @@ public class PtyGroupQueryRepository{ .leftJoin(cstmrDtl) .on(cstmr.cstmrSno.eq(cstmrDtl.cstmrSno)) .where(builder) - .orderBy(bas.createDt.desc()) - .offset(pageable.getOffset()) - .limit(pageable.getPageSize()) +// .offset(pageable.getOffset()) +// .limit(pageable.getPageSize()) .fetch(); List result = new ArrayList(); if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { @@ -611,16 +610,25 @@ public class PtyGroupQueryRepository{ result.add(model); } } - return new PageImpl<>(result, pageable, result.size()); - } - for(BasGroupUserModel model : queryResult) { - if(!(model.getMemberName() == null)) { - String memberName = EncryptUtils.decrypt(model.getMemberName()); - model.setMemberName(memberName); - result.add(model); - } - } - return new PageImpl<>(result, pageable, result.size()); + } else{ + for(BasGroupUserModel model : queryResult) { + if(!(model.getMemberName() == null)) { + String memberName = EncryptUtils.decrypt(model.getMemberName()); + model.setMemberName(memberName); + result.add(model); + } + } + } + int startIndex = (int) (pageable.getOffset()); + int endIndex = (int) (pageable.getPageSize() + pageable.getOffset() - 1); + log.info("{}/{}", startIndex,endIndex); + List resultPaging = new ArrayList<>(); + for(int i = startIndex; i <=endIndex; i++ ) { + if(result.size() <= i) break; + resultPaging.add(result.get(i)); + } + + return new PageImpl<>(resultPaging, pageable, resultPaging.size()); } public long userCount(BasGroupUserListModel rq){ QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas;