From 387891b631f064797f356c6ca0f0de448bc0dfce 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: Thu, 29 Sep 2022 11:21:57 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=EC=9E=91=EC=97=85=20-=20?=
 =?UTF-8?q?=EC=8A=B9=EC=9D=B8=EA=B4=80=EB=A6=AC=20=EB=AA=A9=EB=A1=9D=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20,=20=EC=82=AC=EC=9A=A9=EC=9E=90=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pty/PtyGroupQueryRepository.java          | 64 +++++++++++--------
 1 file changed, 37 insertions(+), 27 deletions(-)

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 d8a9dd9..e7a18b3 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
@@ -1,6 +1,8 @@
 package com.palnet.biz.jpa.repository.pty;
 
 
+
+import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil;
 import com.palnet.biz.api.bas.group.model.*;
 import com.palnet.biz.jpa.entity.QPtyCstmrBas;
 import com.palnet.biz.jpa.entity.QPtyCstmrDtl;
@@ -14,6 +16,7 @@ import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 import java.util.ArrayList;
@@ -30,6 +33,10 @@ public class PtyGroupQueryRepository{
      * @param rq
      * @return
      */
+    
+    @Autowired
+    private JwtTokenUtil jwtTokenUtil;
+    
     public List<BasGroupModel> list(BasGroupRqModel rq){
     	
     	QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas;
@@ -194,6 +201,8 @@ public class PtyGroupQueryRepository{
         
         BooleanBuilder builder = new BooleanBuilder();
         
+        String appAuth = jwtTokenUtil.getUserAuthByToken();
+        
         if(!StringUtils.isEmpty(rq.getGroupNm())) {
         	builder.and(bas.groupNm.like("%" + rq.getGroupNm() + "%"));
         }
@@ -203,7 +212,19 @@ public class PtyGroupQueryRepository{
 //        	builder.and(cstmrDtl.memberName.eq(memberName));
 //        }
         
-        
+        if(appAuth.equals("USER")) {
+        	builder.and(bas.groupId.in(
+	                        		JPAExpressions
+	                        		.select(bas.groupId)
+	                        		.from(bas)
+	                        		.leftJoin(dtl)
+	                        		.on(bas.groupId.eq(dtl.groupId))
+	                        		.where(bas.useYn.eq("Y"))
+	                        		.where(dtl.cstmrSno.eq(rq.getCstmrSno()))
+	                        		.where(dtl.groupAuthCd.eq("MASTER").or(dtl.groupAuthCd.eq("LEADER")))
+	                        				
+	                        		));
+        }
         if(!StringUtils.isEmpty(rq.getAprvYn())) {
         	builder.and(dtl.aprvlYn.eq(rq.getAprvYn()));
         }
@@ -237,18 +258,6 @@ public class PtyGroupQueryRepository{
                 		.on(cstmr.cstmrSno.eq(cstmrDtl.cstmrSno))
                         .where(builder)
                 		
-                        .where(bas.groupId.in(
-                        		JPAExpressions
-                        		.select(bas.groupId)
-                        		.from(bas)
-                        		.leftJoin(dtl)
-                        		.on(bas.groupId.eq(dtl.groupId))
-                        		.where(bas.useYn.eq("Y"))
-                        		.where(dtl.cstmrSno.eq(rq.getCstmrSno()))
-//                        		.where(dtl.groupAuthCd.eq("CREATER").or(dtl.groupAuthCd.eq("ADMIN")))
-                        		.where(dtl.groupAuthCd.eq("MASTER").or(dtl.groupAuthCd.eq("LEADER")))
-                        				
-                        		))
                         .where(dtl.cstmrSno.ne(rq.getCstmrSno()))
 //                        .where(dtl.groupAuthCd.ne("CREATER"))
                         .where(dtl.groupAuthCd.ne("MASTER"))
@@ -273,7 +282,7 @@ public class PtyGroupQueryRepository{
 
         return result;
     }
-
+   
     /**
      * 참여 했는지 여부체크
      * @param cstmrSno
@@ -322,12 +331,25 @@ public class PtyGroupQueryRepository{
         QPtyCstmrDtl cstmrDtl = QPtyCstmrDtl.ptyCstmrDtl;
         
         BooleanBuilder builder = new BooleanBuilder();
+        String appAuth = jwtTokenUtil.getUserAuthByToken();
         
         builder.and(bas.useYn.eq("Y"));
         builder.and(dtl.joinYn.eq("Y"));
         builder.and(dtl.aprvlYn.eq("Y"));
         
-        
+        if(appAuth.equals("USER")) {
+        builder.and(bas.groupId.in(
+                        		JPAExpressions
+                        		.select(bas.groupId)
+                        		.from(bas)
+                        		.leftJoin(dtl)
+                        		.on(bas.groupId.eq(dtl.groupId))
+                        		.where(bas.useYn.eq("Y"))
+                        		.where(dtl.cstmrSno.eq(rq.getCstmrSno()))
+                        		.where(dtl.groupAuthCd.eq("MASTER").or(dtl.groupAuthCd.eq("LEADER")))
+                        				
+                        		));
+        }
         if(!StringUtils.isEmpty(rq.getGroupNm())) {
         	builder.and(bas.groupNm.like("%" + rq.getGroupNm() + "%"));
         }
@@ -367,18 +389,6 @@ public class PtyGroupQueryRepository{
                 		.leftJoin(cstmrDtl)
                 		.on(cstmr.cstmrSno.eq(cstmrDtl.cstmrSno))
                         .where(builder)
-                        .where(bas.groupId.in(
-                        		JPAExpressions
-                        		.select(bas.groupId)
-                        		.from(bas)
-                        		.leftJoin(dtl)
-                        		.on(bas.groupId.eq(dtl.groupId))
-                        		.where(bas.useYn.eq("Y"))
-                        		.where(dtl.cstmrSno.eq(rq.getCstmrSno()))
-//                        		.where(dtl.groupAuthCd.eq("CREATER").or(dtl.groupAuthCd.eq("ADMIN")))
-                        		.where(dtl.groupAuthCd.eq("MASTER").or(dtl.groupAuthCd.eq("LEADER")))
-                        				
-                        		))
                         .where(dtl.cstmrSno.ne(rq.getCstmrSno()))
                         
                         .orderBy(bas.createDt.desc())