diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java index 8ea1cdd..7e6799e 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java @@ -118,7 +118,7 @@ public class CtrCntrlController { @ApiOperation(value = "TODO 비행 관제 사용자 권한 정보") @Tag(name = "드론 관제 시스템", description = "드론 관제 관련 API") @ApiImplicitParam(name = "cstmrSno",value = "고객일련번호", dataTypeClass = Integer.class) - public ResponseEntity findGroupAuthInfo() { + public ResponseEntity findGroupAuthInfo(int cstmrSno) { List list; try { diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index 10ee05e..08bfeba 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -1488,7 +1488,9 @@ public List listCntrlHstry(String id){ BooleanBuilder builder = new BooleanBuilder(); builder.and(pgb.useYn.eq("Y")); - builder.and(pcg.groupAuthCd.eq("MASTER")); + if("ADMIN".equals(authId) || "SUPER".equals(authId)) { + builder.and(pcg.groupAuthCd.eq("MASTER")); + } if ("USER".equals(authId) || "ROLE_USER".equals(authId)) { // 앱 권한이 노말이라면 , 본인의 그룹만 불러옴. builder.and(pcg.aprvlYn.eq("Y")); builder.and(pcg.cstmrSno.eq(cstmrSno));