|
|
@ -8,6 +8,7 @@ import java.util.Calendar; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
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.CtrCntrlGroupArcrftModel; |
|
|
|
import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlGroupModel; |
|
|
|
import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlGroupModel; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
@ -642,11 +643,12 @@ public class CtrCntrlQueryRepository{ |
|
|
|
|
|
|
|
|
|
|
|
String authId = jwtTokenUtil.getUserAuthByToken(); |
|
|
|
String authId = jwtTokenUtil.getUserAuthByToken(); |
|
|
|
Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken(); |
|
|
|
Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken(); |
|
|
|
|
|
|
|
List<JwtGroupModel> groupAuthByToken = jwtTokenUtil.getGroupAuthByToken(); |
|
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
builder.and(pcg.aprvlYn.eq("Y")); |
|
|
|
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)); |
|
|
|
builder.and(pcg.cstmrSno.eq(cstmrSno)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -669,6 +671,8 @@ public class CtrCntrlQueryRepository{ |
|
|
|
QComArcrftBas arcrftBas = QComArcrftBas.comArcrftBas; |
|
|
|
QComArcrftBas arcrftBas = QComArcrftBas.comArcrftBas; |
|
|
|
QComIdntfBas idntfBas = QComIdntfBas.comIdntfBas; |
|
|
|
QComIdntfBas idntfBas = QComIdntfBas.comIdntfBas; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String userIdByToken = jwtTokenUtil.getUserIdByToken(); |
|
|
|
|
|
|
|
|
|
|
|
List<CtrCntrlGroupArcrftModel> arcrftList = query.select(Projections.bean(CtrCntrlGroupArcrftModel.class, |
|
|
|
List<CtrCntrlGroupArcrftModel> arcrftList = query.select(Projections.bean(CtrCntrlGroupArcrftModel.class, |
|
|
|
arcrftBas.arcrftSno, |
|
|
|
arcrftBas.arcrftSno, |
|
|
|
arcrftBas.groupId, |
|
|
|
arcrftBas.groupId, |
|
|
|