Merge branch 'master' of http://gitea.palntour.com/pav/pav-server.git

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

@@ -94,11 +94,12 @@ public class BasFlightService {
         ComnPagingRs<BasFlightPlanModel> response = new ComnPagingRs<>();
 		
 		Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord());
-		
-        for(BasGroupJoinModel list : groupList) {
+		if(groupList.size() > 0) {
+            for (BasGroupJoinModel list : groupList) {
                 if (list.getGroupId().equals(rq.getGroupId())) {
                     userAccount = list.getGroupAuthCd();
                 }
+            }
         }
                 if (appAuth.equals("SUPER") || appAuth.equals("ADMIN")) {
                     masterAccount = "ADMIN";
@@ -530,11 +531,13 @@ public class BasFlightService {
         
         String userAccount = null;
         String masterAccount = null;
-        for(JwtGroupModel list : groupAuthList) {
-        	if(list.getGroupId().equals(rq.getGroupId())) {
+        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";
         } else if (userAccount.equals("MASTER") || userAccount.equals("LEADER")) {