diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvRqModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvRqModel.java index b93551b..cb6bbaa 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvRqModel.java +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvRqModel.java @@ -14,6 +14,8 @@ public class BasGroupAprvRqModel extends ComnRqModel{ private String aprvYn; private Integer cstmrSno; + + private String groupId; } diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java index 2023794..6b82dc2 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java @@ -269,7 +269,8 @@ public class PtyGroupQueryRepository{ if(!StringUtils.isEmpty(rq.getAprvYn())) { builder.and(dtl.aprvlYn.eq(rq.getAprvYn())); } - + builder.and(bas.groupId.eq(rq.getGroupId())); + builder.and(dtl.joinYn.eq("Y")); List queryResult =