Merge branch 'master' of http://gitea.palntour.com/pav/pav-server.git

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())
+//                        .offset(pageable.getOffset())
-        				.limit(pageable.getPageSize())
+//        				.limit(pageable.getPageSize())
                         .fetch();
         List<BasGroupUserModel> result = new ArrayList<BasGroupUserModel>();
         if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) {
@@ -611,8 +610,7 @@ public class PtyGroupQueryRepository{
         			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());
@@ -620,7 +618,17 @@ public class PtyGroupQueryRepository{
 					result.add(model);
 				}
 			}
-        return new PageImpl<>(result, pageable, result.size());
+		}
+		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;