From 0d68485f15847f9895285a08b73743c8c48dae4f 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 18:29:45 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8A=B9=EC=9D=B8=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=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/BasGroupAprvService.java    |  2 +-
 .../pty/PtyGroupQueryRepository.java          | 72 ++++---------------
 2 files changed, 13 insertions(+), 61 deletions(-)

diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupAprvService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupAprvService.java
index ad38caa..afb4e63 100644
--- a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupAprvService.java
+++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupAprvService.java
@@ -47,7 +47,7 @@ public class BasGroupAprvService {
 		
 		PageImpl<BasGroupAprvModel> result = query.aprvList(rq, pageable);
 		
-		long total = query.aprvCount(rq);
+		long total = query.aprvCount(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 5ffa618..2d4ea33 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
@@ -305,10 +305,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.contains(memberName));
-//        }
+        if(!StringUtils.isEmpty(rq.getMemberName())) {
+        	builder.and(cstmrDtl.memberName.like("%" + rq.getMemberName() + "%"));
+        }
         
 //        if(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) {
 //        	builder.and(bas.groupId.in(
@@ -361,43 +360,14 @@ public class PtyGroupQueryRepository{
 //                        .where(dtl.groupAuthCd.ne("CREATER"))
                         .where(dtl.groupAuthCd.ne("MASTER"))
                         .orderBy(bas.createDt.desc())
-//                    	.offset(pageable.getOffset())
-//        				.limit(pageable.getPageSize())
+                    	.offset(pageable.getOffset())
+        				.limit(pageable.getPageSize())
                         .fetch();
         
-        List<BasGroupAprvModel> result = new ArrayList<BasGroupAprvModel>();
-        if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) {
-        	for(BasGroupAprvModel model : queryResult) {
-        		String memberName = model.getMemberName();
-        		if(memberName.contains(rq.getMemberName())) {
-        			model.setMemberName(memberName);
-        			result.add(model);
-        		}
-        	}
-        	
-        } else {
-        	
-//        	for(BasGroupAprvModel model : queryResult) {
-//      		model.setMemberName(EncryptUtils.decrypt(model.getMemberName()));
-//        		result.add(model);
-//        	}
-        }
-        // 0 10 - 0-9, 10-19, 20-29
-        // start index = size * page
-        // end index = (size * (page + 1)) - 1
-        
-        int startIndex = (int) (pageable.getOffset());
-        int endIndex = (int) (pageable.getPageSize() + pageable.getOffset() - 1);
-        log.info("{}/{}", startIndex,endIndex);
-        List<BasGroupAprvModel> 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 aprvCount(BasGroupAprvRqModel rq){
+    public long aprvCount(BasGroupAprvRqModel rq, Pageable pageable){
     	QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas;
         QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup;
         QPtyCstmrBas cstmr = QPtyCstmrBas.ptyCstmrBas; 
@@ -411,10 +381,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(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) {
 //        	builder.and(bas.groupId.in(
@@ -469,29 +438,12 @@ public class PtyGroupQueryRepository{
                         .orderBy(bas.createDt.desc())
                         .fetch();
         long cnt = 0;
-        List<BasGroupAprvModel> result = new ArrayList<BasGroupAprvModel>();
-        if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) {
-        	for(BasGroupAprvModel model : queryResult) {
-        		String memberName = model.getMemberName();
-        		if(memberName.contains(rq.getMemberName())) {
-        			model.setMemberName(memberName);
-        			result.add(model);
-        		}
-        	}
-        	for(BasGroupAprvModel list : result) {
+       
+        	for(BasGroupAprvModel list : queryResult) {
         		cnt++;
         	}
         	return cnt;
         }
-//        for(BasGroupAprvModel model : queryResult) {
-//        	model.setMemberName(EncryptUtils.decrypt(model.getMemberName()));
-//        	result.add(model);
-//        }
-        for(BasGroupAprvModel list : result) {
-    		cnt++;
-    	}
-        return cnt;
-    }
     /**
      * 참여 했는지 여부체크
      * @param cstmrSno