From 48f17298342b6cd83c60c783a6c21117061f08d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?= <박재우@DESKTOP-EF7ECBO>
Date: Mon, 19 Sep 2022 19:07:36 +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=ED=95=84=ED=84=B0=EC=A1=B0=EA=B1=B4=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20,=20=EB=B9=84=ED=96=89=EC=9D=B4=EB=A0=A5)?=
 =?UTF-8?q?=20=EC=A0=95=EB=A0=AC=EA=B8=B0=EC=A4=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/bas/flight/service/BasFlightService.java  | 15 ++++++---------
 .../repository/ctr/CtrCntrlQueryRepository.java   |  2 +-
 .../repository/flt/FltPlanQueryRepository.java    |  9 ++++++---
 3 files changed, 13 insertions(+), 13 deletions(-)

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<BasFlightPlanModel> aprvList(BasFlightPlanListRq rq) {
         List<JwtGroupModel> groupAuthList = jwtTokenUtil.getGroupAuthByToken();
         List<String> 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<AnlsHstryRsModel> 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<BasFlightPlanModel> aprvList(BasFlightPlanListRq rq, List<String> groupIdList) {
+    public List<BasFlightPlanModel> 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()));