비행계획서 목록 조회 - 해당 그룹의 권한이 CREATER , ADMIN일시 그룹 전체 목록을 볼 수 있도록 변경(수정은 본인만

가능하게 막을 예정)

src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java

@@ -24,6 +24,7 @@ import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel;
 import com.palnet.biz.api.bas.flight.model.BasFlightPlanListRq;
 import com.palnet.biz.api.bas.flight.model.BasFlightPlanModel;
 import com.palnet.biz.api.bas.flight.model.BasFlightPlanPilotModel;
+import com.palnet.biz.api.bas.group.model.BasGroupJoinModel;
 import com.palnet.biz.jpa.entity.FltPlanArcrft;
 import com.palnet.biz.jpa.entity.FltPlanArea;
 import com.palnet.biz.jpa.entity.FltPlanAreaCoord;
@@ -36,6 +37,7 @@ import com.palnet.biz.jpa.repository.flt.FltPlanAreaRepository;
 import com.palnet.biz.jpa.repository.flt.FltPlanBasRepository;
 import com.palnet.biz.jpa.repository.flt.FltPlanPilotRepository;
 import com.palnet.biz.jpa.repository.flt.FltPlanQueryRepository;
+import com.palnet.biz.jpa.repository.pty.PtyGroupQueryRepository;
 import com.palnet.comn.utils.AreaUtils;
 import com.palnet.comn.utils.EncryptUtils;
 import com.palnet.comn.utils.FlightUtils;
@@ -55,6 +57,7 @@ public class BasFlightService {
     private final FltPlanAreaCoordRepository fltPlanAreaCoordRepository;
     private final FltPlanPilotRepository fltPlanPilotRepository;
     private final FltPlanQueryRepository fltPlanQueryRepository;
+    private final PtyGroupQueryRepository ptyPlanQueryRepository;
     private final ComArcrftBasRepository comArcrftBasRepository;
     private final JwtTokenUtil jwtTokenUtil;
     private final AreaUtils areaUtils;
@@ -63,8 +66,20 @@ public class BasFlightService {
 
     // 비행계획서 조회
     public List<BasFlightPlanModel> listPlan(BasFlightPlanListRq rq) {
-        List<JwtGroupModel> groupAuthList = jwtTokenUtil.getGroupAuthByToken();
-        return fltPlanQueryRepository.listPlan(rq);
+        List<BasGroupJoinModel> groupList = ptyPlanQueryRepository.joinList(rq.getCstmrSno());
+        String userAccount = null;
+        String masterAccount = null;
+        for(BasGroupJoinModel list : groupList) {
+        	if(list.getGroupId().equals(rq.getGroupId())) {
+        		userAccount = list.getGroupAuthCd();
+        		if(userAccount.equals("CREATER")||userAccount.equals("ADMIN")) {
+        			masterAccount = userAccount;
+        		}else {
+        			masterAccount = "USER";
+        		}
+        	}
+        }
+        return fltPlanQueryRepository.listPlan(rq, masterAccount);
     }
 
     // 비행계획서 상세 조회

src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

@@ -25,7 +25,7 @@ public class FltPlanQueryRepository {
 
     // 비행계획서 목록
     // TODO 현재 모두 조회 - 권한에 따른 조회 필요
-    public List<BasFlightPlanModel> listPlan(BasFlightPlanListRq rq) {
+    public List<BasFlightPlanModel> listPlan(BasFlightPlanListRq rq, String masterAccount) {
         QFltPlanBas bas = QFltPlanBas.fltPlanBas;
         QFltPlanArea area = QFltPlanArea.fltPlanArea;
         
@@ -36,7 +36,9 @@ public class FltPlanQueryRepository {
         }
 
         if (rq.getCstmrSno() != null) {
-            builder.and(bas.cstmrSno.eq(rq.getCstmrSno()));
+        	if(masterAccount.equals("USER")) {
+        		builder.and(bas.cstmrSno.eq(rq.getCstmrSno()));
+        	}
         }
 
         if (rq.getSchFltEndDt() != null) {