From f52ed400e49ca43b98532ad27cc8c0393a108490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?= Date: Mon, 29 Jan 2024 17:03:17 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20NPE=20=EB=B0=A9=EC=A7=80=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pty/PtyCstmrQueryRepository.java | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java index 8522ded7..d8e60205 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java @@ -238,25 +238,25 @@ public class PtyCstmrQueryRepository { .where(builder) .fetchFirst(); - PtyCstmrDtl dtlEntity = query.select(dtl) - .from(dtl) - .where(dtl.cstmrSno.eq(entity.getCstmrSno())) - .fetchFirst(); - - List pcgEntityList = null; if (entity != null) { - BooleanBuilder groupBuilder = new BooleanBuilder(); - groupBuilder.and(group.cstmrSno.eq(entity.getCstmrSno()) - .and(group.joinYn.eq("Y"))); - - pcgEntityList = query.select(group) - .from(group) - .where(groupBuilder) - .fetch(); - } + PtyCstmrDtl dtlEntity = query.select(dtl) + .from(dtl) + .where(dtl.cstmrSno.eq(entity.getCstmrSno())) + .fetchFirst(); + + List pcgEntityList = null; + if (entity != null) { + BooleanBuilder groupBuilder = new BooleanBuilder(); + groupBuilder.and(group.cstmrSno.eq(entity.getCstmrSno()) + .and(group.joinYn.eq("Y"))); + + pcgEntityList = query.select(group) + .from(group) + .where(groupBuilder) + .fetch(); + } - if (entity != null) { JwtUserModel model = new JwtUserModel(); model.setAuth(entity.getAuthId()); model.setUserId(entity.getUserId()); @@ -281,8 +281,6 @@ public class PtyCstmrQueryRepository { } else { return null; } - - } /**