From ea539ac5c3c0699d4a20dfc7520d5e06691c3e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?= <박재우@DESKTOP-EF7ECBO> Date: Fri, 7 Oct 2022 15:27:05 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC=20?= =?UTF-8?q?=EB=B0=8F=20nullpointException=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/anls/smlt/service/AnlsSmltService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java b/src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java index db81b8d..f3dafcc 100644 --- a/src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java +++ b/src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java @@ -63,17 +63,18 @@ public class AnlsSmltService { public List list(AnlsHstryRqModel rq){ String appAuth = jwtTokenUtil.getUserAuthByToken(); List groupAuth = jwtTokenUtil.getGroupAuthByToken(); - int cstmrSno = jwtTokenUtil.getCstmrSnoByToken(); + Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken(); + List resultList = new ArrayList<>(); - if(appAuth.equals("SUPER")||appAuth.equals("ADMIN")) { // App 권한이 수퍼 / 어드민일 경우 목록 전부 표출 + if("SUPER".equals(appAuth)||"ADMIN".equals(appAuth)) { // App 권한이 수퍼 / 어드민일 경우 목록 전부 표출 resultList = query.listCntrlBas(rq); } - if(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) { // App 권한은 user이지만 group 권한이 LEADER / MASTER인 그룹이 있는 경우 해당 그룹의 비행 이력 목록 표출 + if("USER".equals(appAuth) || "ROLE_USER".equals(appAuth)) { // App 권한은 user이지만 group 권한이 LEADER / MASTER인 그룹이 있는 경우 해당 그룹의 비행 이력 목록 표출 for (JwtGroupModel list : groupAuth) { - if(list.getGroupAuthCd().equals("MASTER") || list.getGroupAuthCd().equals("LEADER")) { + if("MASTER".equals(list.getGroupAuthCd()) || "LEADER".equals(list.getGroupAuthCd())) { List result = query.cntrlBasAuthList(rq, list.getGroupId()); if (result.size() > 0) { resultList.addAll(result);