From 005f69b96113a0fa0c022ef7dd934b0d7bc71400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Wed, 5 Oct 2022 18:18:35 +0900 Subject: [PATCH] . --- .../biz/jpa/repository/ctr/CtrCntrlQueryRepository.java | 8 ++++++-- .../jpa/repository/flt/FltPlanCtrCntrlRelRepository.java | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanCtrCntrlRelRepository.java 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 0b82cf4..461f10e 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 @@ -8,6 +8,7 @@ import java.util.Calendar; import java.util.Date; import java.util.List; +import com.palnet.biz.api.acnt.jwt.model.JwtGroupModel; import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlGroupArcrftModel; import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlGroupModel; import org.apache.commons.lang3.StringUtils; @@ -640,13 +641,14 @@ public class CtrCntrlQueryRepository{ QPtyCstmrGroup pcg = QPtyCstmrGroup.ptyCstmrGroup; QPtyGroupBas pgb = QPtyGroupBas.ptyGroupBas; - String authId = jwtTokenUtil.getUserAuthByToken(); + String authId = jwtTokenUtil.getUserAuthByToken(); Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken(); + List groupAuthByToken = jwtTokenUtil.getGroupAuthByToken(); BooleanBuilder builder = new BooleanBuilder(); builder.and(pcg.aprvlYn.eq("Y")); - if (!"SUPER".equals(authId) && !"ADMIN".equals(authId)) { + if ("USER".equals(authId) || "ROLE_USER".equals(authId)) { builder.and(pcg.cstmrSno.eq(cstmrSno)); } @@ -669,6 +671,8 @@ public class CtrCntrlQueryRepository{ QComArcrftBas arcrftBas = QComArcrftBas.comArcrftBas; QComIdntfBas idntfBas = QComIdntfBas.comIdntfBas; + String userIdByToken = jwtTokenUtil.getUserIdByToken(); + List arcrftList = query.select(Projections.bean(CtrCntrlGroupArcrftModel.class, arcrftBas.arcrftSno, arcrftBas.groupId, diff --git a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanCtrCntrlRelRepository.java b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanCtrCntrlRelRepository.java new file mode 100644 index 0000000..26b0bde --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanCtrCntrlRelRepository.java @@ -0,0 +1,9 @@ +package com.palnet.biz.jpa.repository.flt; + +import com.palnet.biz.jpa.entity.FltPlanCtrCntrlRel; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface FltPlanCtrCntrlRelRepository extends JpaRepository { + + +}