Browse Source

비행계획서 승인 - SUPER 계정일 경우 승인목록 출력 수정

Test
이학준 2 years ago
parent
commit
fb0067a698
  1. 12
      src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

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

@ -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()));

Loading…
Cancel
Save