|
|
|
@ -2030,10 +2030,6 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken(); |
|
|
|
|
List<JwtGroupModel> groupAuth = jwtTokenUtil.getGroupAuthByToken(); |
|
|
|
|
|
|
|
|
|
log.info("User CstmrSno => {}", cstmrSno); |
|
|
|
|
log.info("User Auth => {}", authId); |
|
|
|
|
log.info("User GroupAuth => {}", groupAuth); |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
builder.and(pgb.useYn.eq("Y")); |
|
|
|
|
if("ADMIN".equals(authId) || "SUPER".equals(authId)) { |
|
|
|
@ -2069,13 +2065,7 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
.on(pcg.groupId.eq(pgb.groupId)) |
|
|
|
|
.groupBy(pgb.groupId) |
|
|
|
|
.where(builder) |
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
log.info("Control Query Result=> {}", model); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
log.info("===================================================================================="); |
|
|
|
|
|
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
for(CtrCntrlGroupModel list : model) { |
|
|
|
|
if(groupAuth != null) { |
|
|
|
@ -2126,11 +2116,7 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
List<JwtGroupModel> groupAuthList = jwtTokenUtil.getGroupAuthByToken(); |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
builder.and(arcrftBas.groupId.eq(groupId)); |
|
|
|
|
|
|
|
|
|
log.info("groupId => {}", groupId); |
|
|
|
|
log.info("User CstmrSno => {}", cstmrSno); |
|
|
|
|
log.info("User Auth => {}", appAuth); |
|
|
|
|
builder.and(arcrftBas.groupId.eq(groupId)); |
|
|
|
|
|
|
|
|
|
if("USER".equals(appAuth) || "ROLE_USER".equals(appAuth)) { |
|
|
|
|
for(JwtGroupModel list : groupAuthList) { |
|
|
|
@ -2165,9 +2151,6 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
.where(builder) |
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
log.info("Arcrft Query Result => {}", arcrftList); |
|
|
|
|
|
|
|
|
|
return arcrftList; |
|
|
|
|
//-------------------------------------------
|
|
|
|
|
|
|
|
|
|