diff --git a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java
index 8ec5bed..a9d1f84 100644
--- a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java
+++ b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java
@@ -94,10 +94,11 @@ public class BasFlightService {
         ComnPagingRs<BasFlightPlanModel> response = new ComnPagingRs<>();
 		
 		Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord());
-		
-        for(BasGroupJoinModel list : groupList) {
-            if (list.getGroupId().equals(rq.getGroupId())) {
-                userAccount = list.getGroupAuthCd();
+		if(groupList.size() > 0) {
+            for (BasGroupJoinModel list : groupList) {
+                if (list.getGroupId().equals(rq.getGroupId())) {
+                    userAccount = list.getGroupAuthCd();
+                }
             }
         }
                 if (appAuth.equals("SUPER") || appAuth.equals("ADMIN")) {
@@ -530,10 +531,12 @@ public class BasFlightService {
         
         String userAccount = null;
         String masterAccount = null;
-        for(JwtGroupModel list : groupAuthList) {
-        	if(list.getGroupId().equals(rq.getGroupId())) {
-        		userAccount = list.getGroupAuthCd();
-        	}
+        if(groupAuthList.size() > 0) {
+            for (JwtGroupModel list : groupAuthList) {
+                if (list.getGroupId().equals(rq.getGroupId())) {
+                    userAccount = list.getGroupAuthCd();
+                }
+            }
         }
         if (appAuth.equals("SUPER") || appAuth.equals("ADMIN")) {
             masterAccount = "ADMIN";