Merge branch 'master' of http://gitea.palntour.com/pav/pav-server

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

@@ -34,7 +34,7 @@ public class PtyDronQueryRepository{
      * @param rq
      * @return
      */
-    public List<BasDronModel> list(BasDronRqModel rq){
+    public List<BasDronModel> list(BasDronRqModel rq){    	
     	
     	QComArcrftBas bas = QComArcrftBas.comArcrftBas;
     	QComIdntfBas idnt = QComIdntfBas.comIdntfBas;
@@ -47,13 +47,15 @@ public class PtyDronQueryRepository{
 		}
 
 		if(!StringUtils.isEmpty(rq.getGroupId())) {
-			builder.and(bas.groupId.eq(rq.getGroupId()));
+			builder.and(bas.groupId.eq(rq.getGroupId()));			
 		}
         
         if(!StringUtils.isEmpty(rq.getArcrftTypeCd())) {
 			builder.and(bas.arcrftTypeCd.eq(rq.getArcrftTypeCd()));
 		}
         
+        builder.and(bas.useYn.eq("Y"));
+        
         List<BasDronModel> result =
                 query.select(Projections.bean(BasDronModel.class , 
                 		bas.groupId,