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

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

@@ -298,12 +298,9 @@ public class FltPlanQueryRepository {
         	builder.and(bas.groupId.in(rq.getGroupId()));
         	builder.and(bas.cstmrSno.eq(rq.getCstmrSno()));
         }
-        if (rq.getSchFltEndDt() != null) {
-            builder.and(bas.schFltStDt.goe(rq.getSchFltStDt()));
-        }
-        if (rq.getSchFltStDt() != null) {
-            builder.and(bas.schFltEndDt.loe(rq.getSchFltEndDt()));
-        }
+        builder.and(bas.schFltStDt.goe(rq.getSchFltStDt()));
+		builder.and(bas.schFltStDt.before(rq.getSchFltEndDt()));
+
         if (rq.getAprvlYn() != null && !"A".equals(rq.getAprvlYn())) {
             builder.and(bas.aprvlYn.eq(rq.getAprvlYn()));
         }