|
|
|
@ -307,7 +307,7 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
|
|
|
|
|
// if(!StringUtils.isEmpty(rq.getMemberName())) {
|
|
|
|
|
// String memberName = EncryptUtils.encrypt(rq.getMemberName());
|
|
|
|
|
// builder.and(cstmrDtl.memberName.eq(memberName));
|
|
|
|
|
// builder.and(cstmrDtl.memberName.contains(memberName));
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// if(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) {
|
|
|
|
@ -361,8 +361,8 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
// .where(dtl.groupAuthCd.ne("CREATER"))
|
|
|
|
|
.where(dtl.groupAuthCd.ne("MASTER")) |
|
|
|
|
.orderBy(bas.createDt.desc()) |
|
|
|
|
.offset(pageable.getOffset()) |
|
|
|
|
.limit(pageable.getPageSize()) |
|
|
|
|
// .offset(pageable.getOffset())
|
|
|
|
|
// .limit(pageable.getPageSize())
|
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
List<BasGroupAprvModel> result = new ArrayList<BasGroupAprvModel>(); |
|
|
|
@ -374,14 +374,28 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
result.add(model); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return new PageImpl<>(result, pageable, result.size()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
|
|
for(BasGroupAprvModel model : queryResult) { |
|
|
|
|
model.setMemberName(EncryptUtils.decrypt(model.getMemberName())); |
|
|
|
|
result.add(model); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// 0 10 - 0-9, 10-19, 20-29
|
|
|
|
|
// start index = size * page
|
|
|
|
|
// end index = (size * (page + 1)) - 1
|
|
|
|
|
|
|
|
|
|
return new PageImpl<>(result, pageable, result.size()); |
|
|
|
|
int startIndex = (int) (pageable.getOffset()); |
|
|
|
|
int endIndex = (int) (pageable.getPageSize() + pageable.getOffset() - 1); |
|
|
|
|
log.info("{}/{}", startIndex,endIndex); |
|
|
|
|
List<BasGroupAprvModel> resultPaging = new ArrayList<>(); |
|
|
|
|
for(int i = startIndex; i <=endIndex; i++ ) { |
|
|
|
|
if(result.size() <= i) break; |
|
|
|
|
resultPaging.add(result.get(i)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return new PageImpl<>(resultPaging, pageable, resultPaging.size()); |
|
|
|
|
} |
|
|
|
|
public long aprvCount(BasGroupAprvRqModel rq){ |
|
|
|
|
QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; |
|
|
|
@ -729,4 +743,5 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
return result; |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|