diff --git a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java index 84b62df..8ec5bed 100644 --- a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java +++ b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java @@ -518,7 +518,8 @@ public class BasFlightService { // 비행계획서 리스트(승인) public ComnPagingRs aprvList(BasFlightPlanListRq rq) { - + String appAuth = jwtTokenUtil.getUserAuthByToken(); + ComnPagingRs response = new ComnPagingRs<>(); Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord()); @@ -528,15 +529,22 @@ public class BasFlightService { List groupIdList = new ArrayList<>(); String userAccount = null; + String masterAccount = null; for(JwtGroupModel list : groupAuthList) { if(list.getGroupId().equals(rq.getGroupId())) { userAccount = list.getGroupAuthCd(); } } + if (appAuth.equals("SUPER") || appAuth.equals("ADMIN")) { + masterAccount = "ADMIN"; + } else if (userAccount.equals("MASTER") || userAccount.equals("LEADER")) { + masterAccount = "ADMIN"; + } else { + masterAccount = "NORMAL"; + } + PageImpl result = fltPlanQueryRepository.aprvList(rq, masterAccount, pageable); - PageImpl result = fltPlanQueryRepository.aprvList(rq, userAccount, pageable); - - long total = fltPlanQueryRepository.aprvCount(rq, userAccount); + long total = fltPlanQueryRepository.aprvCount(rq, masterAccount); long totalPage = total % rq.getRecord() > 0 ? (total/rq.getRecord()) + 1 : total/rq.getRecord(); 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 a755f4d..6450d4e 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 @@ -3,6 +3,7 @@ package com.palnet.biz.jpa.repository.flt; import java.util.Date; import java.util.List; +import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Repository; @@ -393,14 +394,13 @@ public class FltPlanQueryRepository { return models; } - public PageImpl aprvList(BasFlightPlanListRq rq, String userAccount, Pageable pageable) { + public PageImpl aprvList(BasFlightPlanListRq rq, String masterAccount, Pageable pageable) { QFltPlanBas bas = QFltPlanBas.fltPlanBas; QFltPlanArea area = QFltPlanArea.fltPlanArea; - BooleanBuilder builder = new BooleanBuilder(); // if (userAccount.equals("CREATER") || userAccount.equals("ADMIN")) { - if(userAccount != null) { - if (userAccount.equals("MASTER") || userAccount.equals("LEADER")) { + if(masterAccount != null) { + if (masterAccount.equals("SPUER") || masterAccount.equals("ADMIN")) { builder.and(bas.groupId.in(rq.getGroupId())); } else { builder.and(bas.groupId.in(rq.getGroupId())); @@ -463,14 +463,14 @@ public class FltPlanQueryRepository { return new PageImpl<>(r,pageable, r.size()); } - public long aprvCount(BasFlightPlanListRq rq, String userAccount) { + public long aprvCount(BasFlightPlanListRq rq, String masterAccount) { QFltPlanBas bas = QFltPlanBas.fltPlanBas; QFltPlanArea area = QFltPlanArea.fltPlanArea; BooleanBuilder builder = new BooleanBuilder(); // if (userAccount.equals("CREATER") || userAccount.equals("ADMIN")) { - if(userAccount != null) { - if (userAccount.equals("MASTER") || userAccount.equals("LEADER")) { + if(masterAccount != null) { + if (masterAccount.equals("SUPER") || masterAccount.equals("ADMIN")) { builder.and(bas.groupId.in(rq.getGroupId())); } else { builder.and(bas.groupId.in(rq.getGroupId()));