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 dbc1d4cb..39fc3860 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,27 +305,17 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport .limit(pageable.getPageSize()) .fetch(); - /* Long countQuery = queryFactory - .select(labelingAssignmentEntity.workerUid.count()) + .select(labelingAssignmentEntity.workerUid.countDistinct()) .from(labelingAssignmentEntity) + .innerJoin(memberEntity) + .on(whereSubBuilder) .where(whereBuilder) + //.groupBy(memberEntity.userRole, memberEntity.name, memberEntity.userId) .fetchOne(); - */ - Long total = - queryFactory - .select(mapSheetAnalInferenceEntity.uuid.countDistinct()) - .from(mapSheetAnalInferenceEntity) - .innerJoin(mapSheetAnalDataInferenceEntity) - .on(whereSubDataBuilder) - .innerJoin(mapSheetAnalDataInferenceGeomEntity) - .on(whereSubBuilder) - .where(whereBuilder) - .fetchOne(); - - return new PageImpl<>(foundContent, pageable, total); + return new PageImpl<>(foundContent, pageable, countQuery); } /**