|
|
|
@ -306,10 +306,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.getMemberName())) {
|
|
|
|
@ -357,9 +357,19 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
.orderBy(bas.createDt.desc()) |
|
|
|
|
.fetch(); |
|
|
|
|
List<BasGroupUserModel> result = new ArrayList<BasGroupUserModel>(); |
|
|
|
|
|
|
|
|
|
if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
|
model.setMemberName(EncryptUtils.decrypt(model.getMemberName())); |
|
|
|
|
String memberName = EncryptUtils.decrypt(model.getMemberName()); |
|
|
|
|
if(memberName.contains(rq.getMemberName())) { |
|
|
|
|
model.setMemberName(memberName); |
|
|
|
|
result.add(model); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
|
String memberName = EncryptUtils.decrypt(model.getMemberName()); |
|
|
|
|
model.setMemberName(memberName); |
|
|
|
|
result.add(model); |
|
|
|
|
} |
|
|
|
|
return result; |
|
|
|
|