diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java index 761001fe..6da44ddf 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java @@ -401,15 +401,15 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport // pnu가 들어온 경우 boolean hasPnu = pnu != null && !pnu.isBlank(); + // pnu 가 없을 때 if (!hasPnu) { builder.and( mapSheetAnalDataInferenceGeomEntity .resultUid - .eq(chnDtctId) + .eq(cdObjectId) .or(mapSheetAnalDataInferenceGeomEntity.resultUid.in(cdObjectIds))); } - // List list = JPAQuery query = queryFactory .select( @@ -436,11 +436,8 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid)) .innerJoin(mapSheetLearnEntity) .on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId)); - // .where(builder) - // .orderBy(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.asc()); - // .fetch(); - // 🔥 pnu 조건이면 tb_pnu join 추가 + // pnu 조건이면 tb_pnu join 추가 if (hasPnu) { query .innerJoin(pnuEntity) @@ -499,15 +496,15 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport // pnu가 들어온 경우 boolean hasPnu = pnu != null && !pnu.isBlank(); + // pnu 가 없을 때 if (!hasPnu) { builder.and( mapSheetAnalDataInferenceGeomEntity .resultUid - .eq(chnDtctId) + .eq(cdObjectId) .or(mapSheetAnalDataInferenceGeomEntity.resultUid.in(cdObjectIds))); } - // List list = JPAQuery query = queryFactory .select( @@ -528,10 +525,8 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid)) .innerJoin(mapSheetLearnEntity) .on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId)); - // .where(builder) - // .fetch(); - // 🔥 pnu 조건이면 tb_pnu join 추가 + // pnu 조건이면 tb_pnu join 추가 if (hasPnu) { query .innerJoin(pnuEntity)