From a49eeec018b8a94e9e090b48a384b7d1258f09b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= <dhji@palnet.co.kr>
Date: Thu, 14 Jul 2022 07:53:58 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EC=B2=B4=EC=A0=95=EB=B3=B4=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20-=20?=
 =?UTF-8?q?=EA=B8=B0=EC=B2=B4=EB=AA=A9=EB=A1=9D=20=EC=A4=91=EB=B3=B5?=
 =?UTF-8?q?=EA=B1=B4=20-=20=EA=B8=B0=EC=B2=B4=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=20=EC=84=9C=EB=B2=84=20=EC=97=90=EB=9F=AC=20?=
 =?UTF-8?q?=20=20(=EB=8B=A8=EA=B1=B4=20=EB=8D=B0=EC=9D=B4=ED=84=B0?=
 =?UTF-8?q?=EB=A1=9C=20=EA=B2=B0=EA=B3=BC=EA=B0=80=20=EB=82=98=EC=99=80?=
 =?UTF-8?q?=EC=95=BC=20=ED=95=98=EB=8A=94=EB=8D=B0=202=EA=B1=B4=EC=9D=B4?=
 =?UTF-8?q?=EC=83=81=EC=9D=98=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EC=97=90=EB=9F=AC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/api/bas/dron/model/BasDronModel.java  |  4 +++-
 .../api/bas/dron/service/BasDronService.java  |  2 +-
 .../pty/PtyDronQueryRepository.java           | 19 +++----------------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronModel.java b/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronModel.java
index 9342031..09a1098 100644
--- a/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronModel.java
+++ b/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronModel.java
@@ -55,6 +55,8 @@ public class BasDronModel {
 	private String newIdntfNum; //변경된 식별 정보
 	
 	private String idntfTypeCd;
-	
+
+	private String ownerNm;
+
 	
 }
diff --git a/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java b/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java
index 67f4d1a..5a6c1c1 100644
--- a/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java
+++ b/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java
@@ -43,7 +43,7 @@ public class BasDronService {
 	 */
 	public List<BasDronModel> list(BasDronRqModel rq){
 		List<BasDronModel> resultList = query.list(rq);
-		return resultList;
+	return resultList;
 	}
 	
 	/**
diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java
index 5b6f968..b88a6a2 100644
--- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java
+++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java
@@ -74,14 +74,8 @@ public class PtyDronQueryRepository{
         				bas.takeoffWght,
         				bas.updateDt,
         				bas.updateUserId,
-        				bas.wghtTypeCd,
-        				idnt.idntfNum,
-        				idnt.ownerNm
+        				bas.wghtTypeCd
         				)).from(bas)
-                		.leftJoin(idnt)
-                		.on(bas.arcrftSno.eq(idnt.arcrftSno))
-                		.on(bas.useYn.eq("Y"))
-                		
                 		.where(builder)
                         .orderBy(bas.createDt.desc())
                         .fetch();
@@ -141,8 +135,7 @@ public class PtyDronQueryRepository{
     public BasDronModel detail(int arcrftSno){
     	
     	QComArcrftBas bas = QComArcrftBas.comArcrftBas;
-    	QComIdntfBas idnt = QComIdntfBas.comIdntfBas;
-    	
+
     	BasDronModel result = 
                 query.select(Projections.bean(BasDronModel.class , 
                 		bas.groupId,
@@ -164,14 +157,8 @@ public class PtyDronQueryRepository{
         				bas.updateDt,
         				bas.updateUserId,
         				bas.wghtTypeCd,
-        				bas.imageUrl,
-        				idnt.idntfNum,
-        				idnt.ownerNm,
-        				idnt.hpno
+        				bas.imageUrl
         				)).from(bas)
-                		.leftJoin(idnt)
-                		.on(bas.arcrftSno.eq(idnt.arcrftSno))
-                		.on(bas.useYn.eq("Y"))
                 		.where(bas.arcrftSno.eq(arcrftSno))
                         .fetchOne();