|
|
@ -93,18 +93,17 @@ public class BasFlightService { |
|
|
|
String appAuth = jwtTokenUtil.getUserAuthByToken(); |
|
|
|
String appAuth = jwtTokenUtil.getUserAuthByToken(); |
|
|
|
|
|
|
|
|
|
|
|
for(BasGroupJoinModel list : groupList) { |
|
|
|
for(BasGroupJoinModel list : groupList) { |
|
|
|
if(list.getGroupId().equals(rq.getGroupId())) { |
|
|
|
if (list.getGroupId().equals(rq.getGroupId())) { |
|
|
|
userAccount = list.getGroupAuthCd(); |
|
|
|
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"; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
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); |
|
|
|
return fltPlanQueryRepository.listPlan(rq, masterAccount); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|