diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java index d26d4a3..4ca78e8 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java @@ -98,6 +98,8 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom { BooleanBuilder builder = new BooleanBuilder(); + builder.and(dataset.deleted.isFalse()); + if (StringUtils.isNotBlank(req.getDataType()) && !"CURRENT".equals(req.getDataType())) { builder.and(dataset.dataType.eq(req.getDataType())); } @@ -249,6 +251,7 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom { public List getDatasetSelectG2G3List(DatasetReq req) { BooleanBuilder builder = new BooleanBuilder(); + builder.and(dataset.deleted.isFalse()); NumberExpression selectedCnt = null; NumberExpression wasteCnt =