From be9b9aa6d0c0e98dd0c90f537ed112be42f05d59 Mon Sep 17 00:00:00 2001 From: hagjoon Date: Thu, 29 Sep 2022 18:30:12 +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-=20=EA=B6=8C=ED=95=9C=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=B6=9C=EB=A0=A5=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=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 | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 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 a5e4e20..2a681cf 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 @@ -93,18 +93,17 @@ public class BasFlightService { String appAuth = jwtTokenUtil.getUserAuthByToken(); for(BasGroupJoinModel list : groupList) { - if(list.getGroupId().equals(rq.getGroupId())) { - userAccount = list.getGroupAuthCd(); -// if(userAccount.equals("CREATER")||userAccount.equals("ADMIN")) { - if(userAccount.equals("MASTER")||userAccount.equals("LEADER") || appAuth.equals("USER") || appAuth.equals("ROLE_USER")) { - masterAccount = "ADMIN"; - }else { -// masterAccount = "USER"; - masterAccount = "NORMAL"; - } - } + if (list.getGroupId().equals(rq.getGroupId())) { + userAccount = list.getGroupAuthCd(); + } } - log.info("masterAccount : >>>>> {}" , appAuth); + if (appAuth.equals("SUPER") || appAuth.equals("ADMIN")) { + masterAccount = "ADMIN"; + } else if (userAccount.equals("MASTER") || userAccount.equals("LEADER")) { + masterAccount = "ADMIN"; + } else { + masterAccount = "NORMAL"; + } return fltPlanQueryRepository.listPlan(rq, masterAccount); }