From e0a3126fa342f4a3c882020899f9924fbddd5a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Mon, 17 Oct 2022 16:54:15 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EC=A0=9C=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=20=EA=B6=8C=ED=95=9C=20=EC=A0=95=EB=B3=B4=20=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/ctr/cntrl/controller/CtrCntrlController.java | 2 +- .../biz/jpa/repository/ctr/CtrCntrlQueryRepository.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) 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));