From 206dec01838fe0fce7e3edc98bb6538bec27c749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?=
 <박재우@host.docker.internal>
Date: Wed, 15 Nov 2023 16:31:30 +0900
Subject: [PATCH] =?UTF-8?q?=EB=93=9C=EB=A1=A0=ED=98=84=ED=99=A9=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/dash/service/MainDashService.java    | 19 +++----------------
 .../flt/FltPlanQueryRepository.java           |  8 ++++----
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java b/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java
index 4322f817..9e40facc 100644
--- a/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java
+++ b/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java
@@ -133,9 +133,6 @@ public class MainDashService {
 	   public List<MainDashFlightListModel> mainDashDronFlightList(String serviceType){
 		      
 		      String cptAuth = token.getCptAuthCodeByToken();
-		      List<JwtGroupModel> userGroupList = token.getGroupAuthByToken();
-		      
-		      BasGroupModel myFirstGroup = new BasGroupModel();
 		      
 		      List<MainDashFlightListModel> resultList = new ArrayList<MainDashFlightListModel>();
 		      
@@ -159,24 +156,14 @@ public class MainDashService {
 	
 	public Map<String, String> mainDashDronFlightStcs(){
 		
-		String userAuth = token.getUserAuthByToken();
-		List<JwtGroupModel> userGroupList = token.getGroupAuthByToken();
+		String cptAuth = token.getCptAuthCodeByToken();
 		
-		BasGroupModel myFirstGroup = new BasGroupModel();
+		cptAuth = "KAC";
 		
 		Map<String, String> resultList = new HashMap<>();
 		
-		if(userAuth.equals("SUPER")) {
-			
-			resultList = fltPlanQueryRepository.getFlightDronStcs("KAC");
-			
-		}else {
+		resultList = fltPlanQueryRepository.getFlightDronStcs(cptAuth);
 			
-			myFirstGroup = ptyGroupQueryRepository.myFirstGroup(userGroupList);
-			
-			resultList = fltPlanQueryRepository.getFlightDronStcs(myFirstGroup.getGroupId());
-		}
-		
 		return resultList;
 	}
 	/**
diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
index 9b7642e1..c36f8063 100644
--- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
+++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
@@ -1999,7 +1999,7 @@ public class FltPlanQueryRepository {
     	return result;
     }
     
-    public Map<String, String> getFlightDronStcs(String groupId){
+    public Map<String, String> getFlightDronStcs(String cptAuth){
     	
     	QComIdntfBas cib = QComIdntfBas.comIdntfBas;
     	QFltPlanArcrft fpa = QFltPlanArcrft.fltPlanArcrft;
@@ -2010,9 +2010,9 @@ public class FltPlanQueryRepository {
 
     	BooleanBuilder builder = new BooleanBuilder();		
     	
-    	if(!groupId.equals("all")) {
-    		builder.and(pgb.groupId.eq(groupId));
-    	}
+    	if(!cptAuth.equals("KAC")) {
+    		builder.and(pgb.groupNm.eq("cptAuth"));
+		}
     	Instant now = Instant.now();
     	
     	Instant todayStart = LocalDate.now().atStartOfDay().toInstant(ZoneOffset.UTC);