From cbbcbd7209d182894dc2088e10035404abe836a7 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: Tue, 18 Oct 2022 10:21:07 +0900
Subject: [PATCH] =?UTF-8?q?=EB=93=9C=EB=A1=A0=EA=B4=80=EC=A0=9C=20?=
 =?UTF-8?q?=EA=B6=8C=ED=95=9C=EB=B3=84=20list=20-=20rs=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/ctr/cntrl/controller/CtrCntrlController.java   |  2 +-
 .../biz/api/ctr/cntrl/service/CtrCntrlService.java     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 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 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<? extends BasicResponse> findGroupAuthInfo(int cstmrSno) {
-		List<CtrCntrlGroupModel> list;
+		List<CtrCntrlGroupArcrftModel> 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<CtrCntrlGroupModel> getGroupAuthInfo() {
+	public List<CtrCntrlGroupArcrftModel> getGroupAuthInfo() {
 		
 		List<CtrCntrlGroupModel> list = query.findByGroupInfo();
-
+		List<CtrCntrlGroupArcrftModel> arcrftList= new ArrayList<>();
 			for(CtrCntrlGroupModel lists : list) {			  
-				List<CtrCntrlGroupArcrftModel> arcrftList = query.findByGroupArcrft(lists.getGroupId());
-				lists.setArcrftList(arcrftList);
+				List<CtrCntrlGroupArcrftModel> groupArcrft = query.findByGroupArcrft(lists.getGroupId());
+				arcrftList.addAll(groupArcrft);
 			}
-			return list;
+			return arcrftList;
 	}
 
 	/**