비행계획서 권한에 따른 리스트 출력

src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java

@@ -76,7 +76,6 @@ public class AnlsHstryService {
 		}
 
 		ComnPagingRs<AnlsHstryRsModel> response = new ComnPagingRs<>();
-		List<AnlsHstryRsModel> returnList = new ArrayList<>();
 		
 
 		Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord());

src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java

@@ -90,18 +90,21 @@ public class BasFlightService {
         List<BasGroupJoinModel> groupList = ptyPlanQueryRepository.joinList(rq.getCstmrSno());
         String userAccount = null;
         String masterAccount = null;
+        String appAuth = jwtTokenUtil.getUserAuthByToken();
+
         for(BasGroupJoinModel list : groupList) {
         	if(list.getGroupId().equals(rq.getGroupId())) {
         		userAccount = list.getGroupAuthCd();
 //        		if(userAccount.equals("CREATER")||userAccount.equals("ADMIN")) {
-        			if(userAccount.equals("MASTER")||userAccount.equals("LEADER")) {
+        			if(userAccount.equals("MASTER")||userAccount.equals("LEADER") || appAuth.equals("USER") || appAuth.equals("ROLE_USER")) {
-        			masterAccount = userAccount;
+        			masterAccount = "ADMIN";
         		}else {
 //        			masterAccount = "USER";
         			masterAccount = "NORMAL";
         		}
         	}
         }
+        log.info("masterAccount :  >>>>> {}" , appAuth);
         return fltPlanQueryRepository.listPlan(rq, masterAccount);
     }