From 998614b6a854c0b5b6935967ca92763d496aec19 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: Wed, 5 Oct 2022 15:02:23 +0900
Subject: [PATCH] =?UTF-8?q?joinlist=20,=20grouplist=20=EA=B5=90=EC=B2=B4(?=
 =?UTF-8?q?=20=ED=94=84=EB=A1=A0=ED=8A=B8=20=EC=9E=91=EC=97=85=20=EC=A0=84?=
 =?UTF-8?q?=EA=B9=8C=EC=A7=80=20=EB=82=B4=20=EC=B0=B8=EC=97=AC=EA=B7=B8?=
 =?UTF-8?q?=EB=A3=B9=20=EB=AA=A9=EB=A1=9D=EA=B3=BC=20=EA=B7=B8=EB=A3=B9=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=EC=9D=B4=20=EB=B0=98=EB=8C=80=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=B4=EC=9E=85=EB=8B=88=EB=8B=A4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bas/group/service/BasGroupService.java    |  4 ++--
 .../pty/PtyGroupQueryRepository.java          | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java
index ad1dacb..a2362cf 100644
--- a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java
+++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java
@@ -71,7 +71,7 @@ public class BasGroupService {
 	}
 	
 	/**
-	 * 나의 그룹 - 참여 그룹 목록
+	 * 그룹 목록
 	 * @param rq
 	 * @return
 	 */
@@ -83,7 +83,7 @@ public class BasGroupService {
 	}
 	
 	/**
-	 * 그룹 목록
+	 * 나의 그룹 - 참여 그룹 목록
 	 * @param rq
 	 * @return
 	 */
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 6b82dc2..5b6250d 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
@@ -104,7 +104,7 @@ public class PtyGroupQueryRepository{
     }
     
     /**
-     * 나의 그룹 - 참여 그룹 목록
+     * 그룹 목록
      * @param cstmrSno
      * @return
      */
@@ -112,11 +112,13 @@ public class PtyGroupQueryRepository{
     	QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas;
         QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup;
         
+        String appAuth = jwtTokenUtil.getUserAuthByToken();
         BooleanBuilder builder = new BooleanBuilder();
         builder.and(bas.useYn.eq("Y"));
-        builder.and(dtl.joinYn.eq("Y"));
-        builder.and(dtl.cstmrSno.eq(cstmrSno));
-        
+        if(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) {
+            builder.and(dtl.joinYn.eq("Y"));
+            builder.and(dtl.cstmrSno.eq(cstmrSno));
+        }
         List<BasGroupJoinModel> result = 
                 query.select(Projections.bean(BasGroupJoinModel.class , 
                 		bas.groupId,
@@ -136,6 +138,7 @@ public class PtyGroupQueryRepository{
                         .where(builder)
                         .orderBy(dtl.joinDt.desc())
                         .orderBy(bas.createDt.desc())
+                        .groupBy(bas.groupId)
                         .fetch();
 
         return result;
@@ -143,20 +146,19 @@ public class PtyGroupQueryRepository{
     }
     
     /**
-     * 그룹 목록
+     * 나의 그룹 - 참여 그룹 목록
      * @param cstmrSno
      * @return
      */
     public List<BasGroupJoinModel> joinList(int cstmrSno){
     	QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas;
         QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup;
-        String appAuth = jwtTokenUtil.getUserAuthByToken();
+       
         BooleanBuilder builder = new BooleanBuilder();
         builder.and(bas.useYn.eq("Y"));
-        if(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) {
         builder.and(dtl.joinYn.eq("Y"));
         builder.and(dtl.cstmrSno.eq(cstmrSno));
-        }
+        
         List<BasGroupJoinModel> result = 
                 query.select(Projections.bean(BasGroupJoinModel.class , 
                 		bas.groupId,
@@ -176,7 +178,6 @@ public class PtyGroupQueryRepository{
                         .where(builder)
                         .orderBy(dtl.joinDt.desc())
                         .orderBy(bas.createDt.desc())
-                        .groupBy(bas.groupId)
                         .fetch();
         
         return result;