diff --git a/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java b/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java index 05e319ab..d62f8b0d 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java @@ -13,6 +13,8 @@ import com.palnet.biz.api.main.statistics.service.MainStatisticsService; import com.palnet.biz.jpa.entity.FltPlanBas; import com.palnet.biz.jpa.repository.flt.FltPlanBasRepository; import com.palnet.biz.jpa.repository.pty.*; +import com.palnet.comn.code.ErrorCode; +import com.palnet.comn.exception.CustomException; import com.querydsl.core.Tuple; import com.querydsl.core.BooleanBuilder; @@ -139,20 +141,16 @@ public class MainDashService { List resultList = new ArrayList(); -// cptAuth = "KAC"; + cptAuth = "KAC"; // 임시 테스트용으로 KAC 권한 부여 - if(cptAuth.length() != 0) { - - if(cptAuth.equals("KAC")) { + if(cptAuth != null) { resultList = fltPlanQueryRepository.getFlightDronList(cptAuth, serviceType); - - } }else { - resultList = fltPlanQueryRepository.getFlightDronList(cptAuth, serviceType); - } + throw new CustomException(ErrorCode.DATA_NO, "cptAuth가 부여되지 않은 계정입니다"); + } return resultList; } @@ -161,7 +159,9 @@ public class MainDashService { String cptAuth = token.getCptAuthCodeByToken(); - cptAuth = "KAC"; + cptAuth = "KAC"; // 임시 테스트용으로 KAC 권한 부여 + + if(cptAuth == null) throw new CustomException(ErrorCode.DATA_NO, "cptAuth가 부여되지 않은 계정입니다"); Map resultList = new HashMap<>();