diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java index 5002a97a..9c142efa 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java @@ -184,6 +184,8 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC .join(mapSheetAnalDataGeomEntity) .on(mapSheetAnalDataGeomEntity.dataUid.eq(mapSheetAnalDataEntity.id)) .where(builder) + .offset(pageable.getOffset()) + .limit(pageable.getPageSize()) .fetch(); long total = @@ -209,14 +211,12 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC @Override public List getSheets(Long id) { return queryFactory - .select(mapSheetAnalDataGeomEntity.mapSheetNum) + .select(mapSheetAnalDataEntity.mapSheetNum) .from(mapSheetAnalEntity) .join(mapSheetAnalDataEntity) .on(mapSheetAnalDataEntity.analUid.eq(mapSheetAnalEntity.id)) - .join(mapSheetAnalDataGeomEntity) - .on(mapSheetAnalDataGeomEntity.dataUid.eq(mapSheetAnalDataEntity.id)) .where(mapSheetAnalEntity.id.eq(id)) - .groupBy(mapSheetAnalDataGeomEntity.mapSheetNum) + .groupBy(mapSheetAnalDataEntity.mapSheetNum) .fetch(); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/auth/AuthRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/auth/AuthRepositoryImpl.java index c386e70e..c1a9ca90 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/auth/AuthRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/auth/AuthRepositoryImpl.java @@ -75,6 +75,8 @@ public class AuthRepositoryImpl implements AuthRepositoryCustom { userEntity.createdDttm)) .from(userEntity) .where(builder) + .offset(pageable.getOffset()) + .limit(pageable.getPageSize()) .orderBy(userEntity.userId.asc()) .fetch();