|
|
@ -305,11 +305,13 @@ public class FltPlanQueryRepository { |
|
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
// if (userAccount.equals("CREATER") || userAccount.equals("ADMIN")) {
|
|
|
|
// if (userAccount.equals("CREATER") || userAccount.equals("ADMIN")) {
|
|
|
|
if (userAccount.equals("MASTER") || userAccount.equals("LEADER")) { |
|
|
|
if(userAccount != null) { |
|
|
|
builder.and(bas.groupId.in(rq.getGroupId())); |
|
|
|
if (userAccount.equals("MASTER") || userAccount.equals("LEADER")) { |
|
|
|
} else { |
|
|
|
builder.and(bas.groupId.in(rq.getGroupId())); |
|
|
|
builder.and(bas.groupId.in(rq.getGroupId())); |
|
|
|
} else { |
|
|
|
builder.and(bas.cstmrSno.eq(rq.getCstmrSno())); |
|
|
|
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.goe(rq.getSchFltStDt())); |
|
|
|
builder.and(bas.schFltStDt.before(rq.getSchFltEndDt())); |
|
|
|
builder.and(bas.schFltStDt.before(rq.getSchFltEndDt())); |
|
|
|