From 2d674bdc6fd50e0378d6d20d9ba7766299dba4c0 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: Fri, 30 Sep 2022 16:35:49 +0900
Subject: [PATCH] =?UTF-8?q?=EB=82=98=EC=9D=98=EA=B7=B8=EB=A3=B9=20-=20?=
 =?UTF-8?q?=EC=B0=B8=EC=97=AC=EA=B7=B8=EB=A3=B9=20=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=EA=B3=BC=20=EB=82=98=EB=A8=B8=EC=A7=80=20=EA=B7=B8=EB=A3=B9=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20api=20=EB=B6=84=EB=A6=AC=20=ED=9B=84=20?=
 =?UTF-8?q?=EA=B6=8C=ED=95=9C=EC=97=90=20=EB=94=B0=EB=9D=BC=20=ED=91=9C?=
 =?UTF-8?q?=EC=B6=9C=EB=90=98=EB=8A=94=20=EC=A0=95=EB=B3=B4=20=EB=8B=AC?=
 =?UTF-8?q?=EB=9D=BC=EC=A7=80=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bas/group/service/BasGroupService.java    |  8 +++----
 .../pty/PtyGroupQueryRepository.java          | 24 ++++++++++++-------
 2 files changed, 20 insertions(+), 12 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 2c0b546..ad1dacb 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
@@ -75,9 +75,9 @@ public class BasGroupService {
 	 * @param rq
 	 * @return
 	 */
-	public List<BasGroupJoinModel> joinList(int cstmrSno){
+	public List<BasGroupJoinModel> groupList(int cstmrSno){
 		
-		List<BasGroupJoinModel> resultList = query.joinList(cstmrSno);
+		List<BasGroupJoinModel> resultList = query.groupList(cstmrSno);
 		
 		return resultList;
 	}
@@ -87,9 +87,9 @@ public class BasGroupService {
 	 * @param rq
 	 * @return
 	 */
-	public List<BasGroupJoinModel> groupList(int cstmrSno){
+	public List<BasGroupJoinModel> joinList(int cstmrSno){
 		
-		List<BasGroupJoinModel> resultList = query.groupList(cstmrSno);
+		List<BasGroupJoinModel> resultList = query.joinList(cstmrSno);
 		
 		return resultList;
 	}
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 07886e5..9f69d95 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
@@ -108,7 +108,7 @@ public class PtyGroupQueryRepository{
      * @param cstmrSno
      * @return
      */
-    public List<BasGroupJoinModel> joinList(int cstmrSno){
+    public List<BasGroupJoinModel> groupList(int cstmrSno){
     	QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas;
         QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup;
         
@@ -147,30 +147,38 @@ public class PtyGroupQueryRepository{
      * @param cstmrSno
      * @return
      */
-    public List<BasGroupJoinModel> groupList(int cstmrSno){
+    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.cstmrSno.eq(cstmrSno));
         builder.and(dtl.joinYn.eq("Y"));
+        builder.and(dtl.cstmrSno.eq(cstmrSno));
         }
         List<BasGroupJoinModel> result = 
                 query.select(Projections.bean(BasGroupJoinModel.class , 
                 		bas.groupId,
-                		bas.groupNm
+                		bas.groupNm,
+        				bas.groupTypeCd,
+        				dtl.cstmrSno,
+        				dtl.cstmrGroupSno,
+        				bas.updateDt,
+        				bas.createDt,
+        				dtl.aprvlYn,
+        				dtl.joinDt,
+        				dtl.aprvlDt,
+        				dtl.groupAuthCd
         				)).from(bas)
                 		.leftJoin(dtl)
                 		.on(bas.groupId.eq(dtl.groupId))
                         .where(builder)
+                        .orderBy(dtl.joinDt.desc())
                         .orderBy(bas.createDt.desc())
+                        .groupBy(bas.groupId)
                         .fetch();
-
+        
         return result;
 
     }