From fb0067a69898d34b85a9324db4c6c889bc82a071 Mon Sep 17 00:00:00 2001 From: hagjoon Date: Wed, 5 Oct 2022 18:06:59 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D=EC=84=9C?= =?UTF-8?q?=20=EC=8A=B9=EC=9D=B8=20-=20SUPER=20=EA=B3=84=EC=A0=95=EC=9D=BC?= =?UTF-8?q?=20=EA=B2=BD=EC=9A=B0=20=EC=8A=B9=EC=9D=B8=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jpa/repository/flt/FltPlanQueryRepository.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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()));