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 4ce2e4e..83aaf41 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 @@ -486,16 +486,13 @@ public class BasFlightService { public List aprvList(BasFlightPlanListRq rq) { List groupAuthList = jwtTokenUtil.getGroupAuthByToken(); List groupIdList = new ArrayList<>(); - for(JwtGroupModel group : groupAuthList){ - /* 추후 관리자 권한자만 목록가져오도록 수정 - if("CREATER".equals(group.getGroupAuthCd())){ - groupIdList.add(group.getGroupId()); - } - */ - // 사용자가 속한 모든 그룹 추출 - groupIdList.add(group.getGroupId()); + String userAccount = null; + for(JwtGroupModel list : groupAuthList) { + if(list.getGroupId().equals(rq.getGroupId())) { + userAccount = list.getGroupAuthCd(); + } } - return fltPlanQueryRepository.aprvList(rq, groupIdList); + return fltPlanQueryRepository.aprvList(rq, userAccount); } // 비행계획서 승인/미승인 public int aprovePlan(BasFlightAprovRq rq) { diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index 8585597..4d05aae 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -297,7 +297,7 @@ public List listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn .leftJoin(qCtrCntrHstry) .on(qCntrlBasEntity.cntrlId.eq(qCtrCntrHstry.cntrlId)) .where(builder) - .orderBy(qCtrCntrHstry.trmnlRcvDt.desc()) + .orderBy(qCtrCntrHstry.srvrRcvDt.asc()) .fetch(); return resultList; 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 ecdb614..48c6256 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 @@ -288,13 +288,16 @@ public class FltPlanQueryRepository { return models; } - public List aprvList(BasFlightPlanListRq rq, List groupIdList) { + public List aprvList(BasFlightPlanListRq rq, String userAccount) { QFltPlanBas bas = QFltPlanBas.fltPlanBas; QFltPlanArea area = QFltPlanArea.fltPlanArea; BooleanBuilder builder = new BooleanBuilder(); - if (groupIdList != null && !groupIdList.isEmpty()) { - builder.and(bas.groupId.in(groupIdList)); + if (userAccount.equals("CREATER") || userAccount.equals("ADMIN")) { + builder.and(bas.groupId.in(rq.getGroupId())); + } else { + builder.and(bas.groupId.in(rq.getGroupId())); + builder.and(bas.cstmrSno.eq(rq.getCstmrSno())); } if (rq.getSchFltEndDt() != null) { builder.and(bas.schFltStDt.goe(rq.getSchFltStDt()));