From 41d2423946437747a5ff1cbff804952076c544eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?hagjoon=28=EC=9D=B4=ED=95=99=EC=A4=80=29?=
 <dlgkrwns@palnet.co.kr>
Date: Wed, 12 Oct 2022 18:38:19 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=20-=20=ED=8E=98=EC=9D=B4=EC=A7=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pty/PtyGroupQueryRepository.java          | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

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<BasGroupUserModel> result = new ArrayList<BasGroupUserModel>();
         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<BasGroupUserModel> 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;