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 6da44ddf..dfb607e5 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 @@ -211,7 +211,8 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport .where( l.status .eq(Status.END.getId()) - .and(JPAExpressions.selectOne().from(d).where(d.analUid.eq(a.id)).exists())) + .and(JPAExpressions.selectOne().from(d).where(d.analUid.eq(a.id)).exists()), + l.isDeleted.eq(false).or(l.isDeleted.isNull())) .orderBy(l.id.asc()) .fetch(); } 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 6e8a388f..4409d641 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 @@ -160,7 +160,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom { "substring({0} from 1 for 8)", mapSheetLearnEntity.uid), mapSheetLearnEntity.uuid)) .from(mapSheetAnalInferenceEntity) - .leftJoin(mapSheetLearnEntity) + .innerJoin(mapSheetLearnEntity) .on( mapSheetAnalInferenceEntity.learnId.eq(mapSheetLearnEntity.id), mapSheetLearnEntity.isDeleted.eq(false).or(mapSheetLearnEntity.isDeleted.isNull()))