From e1977585bf035d8e120eb0ae0b1fdb1557d18ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?hagjoon=28=EC=9D=B4=ED=95=99=EC=A4=80=29?= Date: Fri, 14 Oct 2022 11:49:45 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D=EC=84=9C?= =?UTF-8?q?=20-=20groupAuth=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bas/flight/service/BasFlightService.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) 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 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";