diff --git a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
index 82c8971..8946652 100644
--- a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
+++ b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
@@ -305,11 +305,13 @@ public class FltPlanQueryRepository {
 
         BooleanBuilder builder = new BooleanBuilder();
 //        if (userAccount.equals("CREATER") || userAccount.equals("ADMIN")) {
-        	if (userAccount.equals("MASTER") || userAccount.equals("LEADER")) {
-            builder.and(bas.groupId.in(rq.getGroupId()));
-        } else {
-        	builder.and(bas.groupId.in(rq.getGroupId()));
-        	builder.and(bas.cstmrSno.eq(rq.getCstmrSno()));
+        if(userAccount != null) {
+            if (userAccount.equals("MASTER") || userAccount.equals("LEADER")) {
+                builder.and(bas.groupId.in(rq.getGroupId()));
+            } else {
+                builder.and(bas.groupId.in(rq.getGroupId()));
+                builder.and(bas.cstmrSno.eq(rq.getCstmrSno()));
+            }
         }
         builder.and(bas.schFltStDt.goe(rq.getSchFltStDt()));
 		builder.and(bas.schFltStDt.before(rq.getSchFltEndDt()));