나의그룹 - 참여그룹 목록과 나머지 그룹 목록 api 분리 후 권한에 따라 표출되는 정보 달라지도록 변경

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;
 	}

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,28 +147,36 @@ 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;