diff --git a/src/main/java/com/urpsys/itmsapi/rem/controller/ResourceManagerController.java b/src/main/java/com/urpsys/itmsapi/rem/controller/ResourceManagerController.java index 443cc592..428e1a78 100644 --- a/src/main/java/com/urpsys/itmsapi/rem/controller/ResourceManagerController.java +++ b/src/main/java/com/urpsys/itmsapi/rem/controller/ResourceManagerController.java @@ -70,8 +70,12 @@ public class ResourceManagerController String strGrpId = tokenInfo.getStrGRP_ID(); String strRole = tokenInfo.getAuthorities(); + log.info("strGrpId [{}]", strGrpId); + log.info("strRole [{}]" , strRole); + log.info("순서 [{}]" , strRole.indexOf("ROLE_ADMIN")); + // 본사그룹 혹은 관리자 가 아닌경우 해당그룹자산만 조회 가능 - if(strGrpId != "GROUP_00000000000000" && strRole != "ROLE_ADMIN") + if(!strGrpId.equals("GROUP_00000000000000") && strRole.indexOf("ROLE_ADMIN")<0) { requestMap.put("strGrpId", strGrpId); } diff --git a/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java b/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java index 48cb0faa..9bd83425 100644 --- a/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java +++ b/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java @@ -77,8 +77,12 @@ public class ReportCheckController String strGrpId = tokenInfo.getStrGRP_ID(); String strRole = tokenInfo.getAuthorities(); + log.info("strGrpId [{}]", strGrpId); + log.info("strRole [{}]" , strRole); + log.info("순서 [{}]" , strRole.indexOf("ROLE_ADMIN")); + // 본사그룹 혹은 관리자 가 아닌경우 해당그룹자산만 조회 가능 - if(strGrpId != "GROUP_00000000000000" && strRole != "ROLE_ADMIN") + if(!strGrpId.equals("GROUP_00000000000000") && strRole.indexOf("ROLE_ADMIN")<0) { requestMap.put("strGrpId", strGrpId); }