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 7e6799e..758bced 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 @@ -119,7 +119,7 @@ public class CtrCntrlController { @Tag(name = "드론 관제 시스템", description = "드론 관제 관련 API") @ApiImplicitParam(name = "cstmrSno",value = "고객일련번호", dataTypeClass = Integer.class) public ResponseEntity findGroupAuthInfo(int cstmrSno) { - List list; + List list; try { list = service.getGroupAuthInfo(); diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java index f7d4f89..5caedfe 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java @@ -184,15 +184,15 @@ public class CtrCntrlService { * @param cstmrSno * @return */ - public List getGroupAuthInfo() { + public List getGroupAuthInfo() { List list = query.findByGroupInfo(); - + List arcrftList= new ArrayList<>(); for(CtrCntrlGroupModel lists : list) { - List arcrftList = query.findByGroupArcrft(lists.getGroupId()); - lists.setArcrftList(arcrftList); + List groupArcrft = query.findByGroupArcrft(lists.getGroupId()); + arcrftList.addAll(groupArcrft); } - return list; + return arcrftList; } /**