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