Merge remote-tracking branch 'origin/master'

src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfModel.java

@@ -24,5 +24,6 @@ public class BasIdntfModel {
 	
 	private Date createDt;
 	
+	private int cstmrSno;
 	
 }

src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java

@@ -40,11 +40,11 @@ public interface FltPlanBasRepository extends JpaRepository<FltPlanBas, Integer>
 
     @Query("Select f from FltPlanBas f " +
             "where f.cstmrSno = :cstmrSno " +
-            "and f.delYn = 'N' " )
+            "and f.aprvlYn = 'Y' " )
     List<FltPlanBas> findByPlanSno(@Param("cstmrSno")int cstmrSno);
     
     @Query("Select f from FltPlanBas f " +
     		"where f.planSno = :planSno " +
-    		"and f.delYn = 'N' " )
+    		"and f.aprvlYn = 'Y' " )
     List<FltPlanBas> findBasList(@Param("planSno")int planSno);
 }

src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java

@@ -183,7 +183,8 @@ public class PtyDronQueryRepository{
         				idnt.createDt,
         				idnt.updateDt,
         				idnt.ownerNm,
-        				idnt.hpno
+        				idnt.hpno,
+        				idnt.cstmrSno
         				)).from(idnt)
                 		.where(builder)
                         .orderBy(idnt.createDt.asc())

src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java

@@ -357,7 +357,7 @@ public class PtyGroupQueryRepository{
                 		.on(cstmr.cstmrSno.eq(cstmrDtl.cstmrSno))
                         .where(builder)
                 		
-                        .where(dtl.cstmrSno.ne(rq.getCstmrSno()))
+//                        .where(dtl.cstmrSno.ne(rq.getCstmrSno()))
 //                        .where(dtl.groupAuthCd.ne("CREATER"))
                         .where(dtl.groupAuthCd.ne("MASTER"))
                         .orderBy(bas.createDt.desc())