From 725ff285a252faa9ec411eeb3be03771f4c666a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?=
 <박재우@DESKTOP-EF7ECBO>
Date: Tue, 18 Oct 2022 17:45:44 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=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

---
 .../group/service/BasGroupUserService.java    |  2 +-
 .../pty/PtyGroupQueryRepository.java          | 77 ++++---------------
 2 files changed, 17 insertions(+), 62 deletions(-)

diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java
index 77e2744..3cc8da8 100644
--- a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java
+++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java
@@ -52,7 +52,7 @@ public class BasGroupUserService {
 		
 		PageImpl<BasGroupUserModel> result = query.userList(rq, pageable);
 		
-		long total = query.userCount(rq);
+		long total = query.userCount(rq, pageable);
 		
 		long totalPage = total % rq.getRecord() > 0 ? (total/rq.getRecord()) + 1 : total/rq.getRecord();
 
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 42a36b3..5ffa618 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
@@ -562,10 +562,9 @@ public class PtyGroupQueryRepository{
 //        	builder.and(bas.groupNm.like("%" + rq.getGroupNm() + "%"));
 //        }
 //       
-//        if(!StringUtils.isEmpty(rq.getMemberName())) {
-//        	String memberName = EncryptUtils.encrypt(rq.getMemberName());
-//        	builder.and(cstmrDtl.memberName.eq(memberName));
-//        }
+        if(!StringUtils.isEmpty(rq.getMemberName())) {
+        	builder.and(cstmrDtl.memberName.like("%" + rq.getMemberName() + "%"));
+        }
         
         
 //        if(!StringUtils.isEmpty(rq.getMemberName())) {
@@ -598,39 +597,15 @@ public class PtyGroupQueryRepository{
                 		.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())) {
-        	for(BasGroupUserModel model : queryResult) {
-        		String memberName = model.getMemberName();
-        		if(memberName.contains(rq.getMemberName())) {
-        			model.setMemberName(memberName);
-        			result.add(model);
-        		}
-        	}
-        } else{
-			for(BasGroupUserModel model : queryResult) {
-				if(!(model.getMemberName() == null)) {
-					String memberName = 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());
+     
+
+        return new PageImpl<>(queryResult, pageable, queryResult.size());
     }
-    public long userCount(BasGroupUserListModel rq){
+    public long userCount(BasGroupUserListModel rq, Pageable pageable){
     	QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas;
         QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup;
         QPtyCstmrBas cstmr = QPtyCstmrBas.ptyCstmrBas;
@@ -659,10 +634,9 @@ public class PtyGroupQueryRepository{
 //        	builder.and(bas.groupNm.like("%" + rq.getGroupNm() + "%"));
 //        }
 //       
-//        if(!StringUtils.isEmpty(rq.getMemberName())) {
-//        	String memberName = EncryptUtils.encrypt(rq.getMemberName());
-//        	builder.and(cstmrDtl.memberName.eq(memberName));
-//        }
+        if(!StringUtils.isEmpty(rq.getMemberName())) {
+        	builder.and(cstmrDtl.memberName.like("%" + rq.getMemberName() + "%"));
+        }
         
         
 //        if(!StringUtils.isEmpty(rq.getMemberName())) {
@@ -694,35 +668,16 @@ public class PtyGroupQueryRepository{
                 		.leftJoin(cstmrDtl)
                 		.on(cstmr.cstmrSno.eq(cstmrDtl.cstmrSno))
                         .where(builder)
-                        
+//                        .offset(pageable.getOffset())
+//        				.limit(pageable.getPageSize())
                         .orderBy(bas.createDt.desc())
                         .fetch();
         long cnt = 0;
-        List<BasGroupUserModel> result = new ArrayList<BasGroupUserModel>();
-        if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) {
-        	for(BasGroupUserModel model : queryResult) {
-        		String memberName = model.getMemberName();
-        		if(memberName.contains(rq.getMemberName())) {
-        			model.setMemberName(memberName);
-        			result.add(model);
-        		}
-        	}
-        	for(BasGroupUserModel list : result) {
+
+        	for(BasGroupUserModel list : queryResult) {
         		cnt++;
         	}
         	return cnt;
-        }
-        for(BasGroupUserModel model : queryResult) {
-        	if(!(model.getMemberName() == null)) {
-        	String memberName = model.getMemberName();
-        	model.setMemberName(memberName);
-        	result.add(model);
-        	}
-        }
-        for(BasGroupUserModel list : result) {
-    		cnt++;
-    	}
-        return cnt;
     }
 	public List<BasGroupModel> groupTop3(int cstmrSno){