diff --git a/src/main/java/com/kamco/cd/kamcoback/code/CommonCodeApiController.java b/src/main/java/com/kamco/cd/kamcoback/code/CommonCodeApiController.java index 20324db6..eaa7f2d6 100644 --- a/src/main/java/com/kamco/cd/kamcoback/code/CommonCodeApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/code/CommonCodeApiController.java @@ -209,6 +209,7 @@ public class CommonCodeApiController { return ApiResponseDto.ok(commonCodeService.findByCode(code)); } + @Operation(summary = "변화탐지 분류 코드 목록", description = "변화탐지 분류 코드 목록(공통코드 기반)") @GetMapping("/clazz") public ApiResponseDto> getClasses() { diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryImpl.java index 4298eedd..c46e73e2 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryImpl.java @@ -58,11 +58,11 @@ public class CommonCodeRepositoryImpl implements CommonCodeRepositoryCustom { return queryFactory .selectFrom(commonCodeEntity) .leftJoin(commonCodeEntity.children, child) - .fetchJoin() + .on(child.deleted.isFalse().or(child.deleted.isNull())) .where( commonCodeEntity.parent.isNull(), - commonCodeEntity.deleted.isFalse().or(commonCodeEntity.deleted.isNull()), - child.deleted.isFalse().or(child.deleted.isNull())) + commonCodeEntity.deleted.isFalse().or(commonCodeEntity.deleted.isNull()) + ) .orderBy(commonCodeEntity.order.asc(), child.order.asc()) .fetch(); }