|
|
@ -368,7 +368,7 @@ public class PtyGroupQueryRepository{ |
|
|
|
List<BasGroupAprvModel> result = new ArrayList<BasGroupAprvModel>(); |
|
|
|
List<BasGroupAprvModel> result = new ArrayList<BasGroupAprvModel>(); |
|
|
|
if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
for(BasGroupAprvModel model : queryResult) { |
|
|
|
for(BasGroupAprvModel model : queryResult) { |
|
|
|
String memberName = EncryptUtils.decrypt(model.getMemberName()); |
|
|
|
String memberName = model.getMemberName(); |
|
|
|
if(memberName.contains(rq.getMemberName())) { |
|
|
|
if(memberName.contains(rq.getMemberName())) { |
|
|
|
model.setMemberName(memberName); |
|
|
|
model.setMemberName(memberName); |
|
|
|
result.add(model); |
|
|
|
result.add(model); |
|
|
@ -377,10 +377,10 @@ public class PtyGroupQueryRepository{ |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
} else { |
|
|
|
|
|
|
|
|
|
|
|
for(BasGroupAprvModel model : queryResult) { |
|
|
|
// for(BasGroupAprvModel model : queryResult) {
|
|
|
|
model.setMemberName(EncryptUtils.decrypt(model.getMemberName())); |
|
|
|
// model.setMemberName(EncryptUtils.decrypt(model.getMemberName()));
|
|
|
|
result.add(model); |
|
|
|
// result.add(model);
|
|
|
|
} |
|
|
|
// }
|
|
|
|
} |
|
|
|
} |
|
|
|
// 0 10 - 0-9, 10-19, 20-29
|
|
|
|
// 0 10 - 0-9, 10-19, 20-29
|
|
|
|
// start index = size * page
|
|
|
|
// start index = size * page
|
|
|
@ -472,7 +472,7 @@ public class PtyGroupQueryRepository{ |
|
|
|
List<BasGroupAprvModel> result = new ArrayList<BasGroupAprvModel>(); |
|
|
|
List<BasGroupAprvModel> result = new ArrayList<BasGroupAprvModel>(); |
|
|
|
if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
for(BasGroupAprvModel model : queryResult) { |
|
|
|
for(BasGroupAprvModel model : queryResult) { |
|
|
|
String memberName = EncryptUtils.decrypt(model.getMemberName()); |
|
|
|
String memberName = model.getMemberName(); |
|
|
|
if(memberName.contains(rq.getMemberName())) { |
|
|
|
if(memberName.contains(rq.getMemberName())) { |
|
|
|
model.setMemberName(memberName); |
|
|
|
model.setMemberName(memberName); |
|
|
|
result.add(model); |
|
|
|
result.add(model); |
|
|
@ -483,10 +483,10 @@ public class PtyGroupQueryRepository{ |
|
|
|
} |
|
|
|
} |
|
|
|
return cnt; |
|
|
|
return cnt; |
|
|
|
} |
|
|
|
} |
|
|
|
for(BasGroupAprvModel model : queryResult) { |
|
|
|
// for(BasGroupAprvModel model : queryResult) {
|
|
|
|
model.setMemberName(EncryptUtils.decrypt(model.getMemberName())); |
|
|
|
// model.setMemberName(EncryptUtils.decrypt(model.getMemberName()));
|
|
|
|
result.add(model); |
|
|
|
// result.add(model);
|
|
|
|
} |
|
|
|
// }
|
|
|
|
for(BasGroupAprvModel list : result) { |
|
|
|
for(BasGroupAprvModel list : result) { |
|
|
|
cnt++; |
|
|
|
cnt++; |
|
|
|
} |
|
|
|
} |
|
|
@ -604,7 +604,7 @@ public class PtyGroupQueryRepository{ |
|
|
|
List<BasGroupUserModel> result = new ArrayList<BasGroupUserModel>(); |
|
|
|
List<BasGroupUserModel> result = new ArrayList<BasGroupUserModel>(); |
|
|
|
if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
String memberName = EncryptUtils.decrypt(model.getMemberName()); |
|
|
|
String memberName = model.getMemberName(); |
|
|
|
if(memberName.contains(rq.getMemberName())) { |
|
|
|
if(memberName.contains(rq.getMemberName())) { |
|
|
|
model.setMemberName(memberName); |
|
|
|
model.setMemberName(memberName); |
|
|
|
result.add(model); |
|
|
|
result.add(model); |
|
|
@ -613,7 +613,7 @@ public class PtyGroupQueryRepository{ |
|
|
|
} else{ |
|
|
|
} else{ |
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
if(!(model.getMemberName() == null)) { |
|
|
|
if(!(model.getMemberName() == null)) { |
|
|
|
String memberName = EncryptUtils.decrypt(model.getMemberName()); |
|
|
|
String memberName = model.getMemberName(); |
|
|
|
model.setMemberName(memberName); |
|
|
|
model.setMemberName(memberName); |
|
|
|
result.add(model); |
|
|
|
result.add(model); |
|
|
|
} |
|
|
|
} |
|
|
@ -701,7 +701,7 @@ public class PtyGroupQueryRepository{ |
|
|
|
List<BasGroupUserModel> result = new ArrayList<BasGroupUserModel>(); |
|
|
|
List<BasGroupUserModel> result = new ArrayList<BasGroupUserModel>(); |
|
|
|
if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
String memberName = EncryptUtils.decrypt(model.getMemberName()); |
|
|
|
String memberName = model.getMemberName(); |
|
|
|
if(memberName.contains(rq.getMemberName())) { |
|
|
|
if(memberName.contains(rq.getMemberName())) { |
|
|
|
model.setMemberName(memberName); |
|
|
|
model.setMemberName(memberName); |
|
|
|
result.add(model); |
|
|
|
result.add(model); |
|
|
@ -714,7 +714,7 @@ public class PtyGroupQueryRepository{ |
|
|
|
} |
|
|
|
} |
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
if(!(model.getMemberName() == null)) { |
|
|
|
if(!(model.getMemberName() == null)) { |
|
|
|
String memberName = EncryptUtils.decrypt(model.getMemberName()); |
|
|
|
String memberName = model.getMemberName(); |
|
|
|
model.setMemberName(memberName); |
|
|
|
model.setMemberName(memberName); |
|
|
|
result.add(model); |
|
|
|
result.add(model); |
|
|
|
} |
|
|
|
} |
|
|
|