Merge remote-tracking branch 'origin/feat/demo-20251205' into feat/demo-20251205

This commit is contained in:
sanghyeonhd
2025-11-28 17:01:16 +09:00
2 changed files with 6 additions and 4 deletions

View File

@@ -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<Long> 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();
}
}

View File

@@ -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();