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 ba04631..7ca3900 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 @@ -197,10 +197,10 @@ public class PtyGroupQueryRepository{ builder.and(bas.groupNm.like("%" + rq.getGroupNm() + "%")); } - if(!StringUtils.isEmpty(rq.getMemberName())) { - String memberName = EncryptUtils.encrypt(rq.getMemberName()); - builder.and(cstmrDtl.memberName.eq(memberName)); - } +// if(!StringUtils.isEmpty(rq.getMemberName())) { +// String memberName = EncryptUtils.encrypt(rq.getMemberName()); +// builder.and(cstmrDtl.memberName.eq(memberName)); +// } if(!StringUtils.isEmpty(rq.getAprvYn())) { @@ -253,7 +253,16 @@ public class PtyGroupQueryRepository{ .fetch(); List result = new ArrayList(); - + if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { + for(BasGroupAprvModel model : queryResult) { + String memberName = EncryptUtils.decrypt(model.getMemberName()); + if(memberName.contains(rq.getMemberName())) { + model.setMemberName(memberName); + result.add(model); + } + } + return result; + } for(BasGroupAprvModel model : queryResult) { model.setMemberName(EncryptUtils.decrypt(model.getMemberName())); result.add(model);