diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java index fc27a3c8..a7de04c2 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java @@ -305,28 +305,17 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport .limit(pageable.getPageSize()) .fetch(); - /* Long countQuery = - queryFactory - .select(labelingAssignmentEntity.workerUid.count()) - .from(labelingAssignmentEntity) - .where(whereBuilder) - .fetchOne(); - */ + queryFactory + .select(labelingAssignmentEntity.workerUid.countDistinct()) + .from(labelingAssignmentEntity) + .innerJoin(memberEntity) + .on(whereSubBuilder) + .where(whereBuilder) + // .groupBy(memberEntity.userRole, memberEntity.name, memberEntity.userId) + .fetchOne(); - Long totalCnt = - (long) - queryFactory - .select(memberEntity.userRole, memberEntity.name, memberEntity.userId) - .from(labelingAssignmentEntity) - .innerJoin(memberEntity) - .on(whereSubBuilder) - .where(whereBuilder) - .groupBy(memberEntity.userRole, memberEntity.name, memberEntity.userId) - .fetch() - .size(); - - return new PageImpl<>(foundContent, pageable, totalCnt); + return new PageImpl<>(foundContent, pageable, countQuery); } /**