diff --git a/src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java b/src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java index 3372e89..f0c02b2 100644 --- a/src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java +++ b/src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java @@ -27,7 +27,11 @@ public interface RksIsiRepository extends JpaRepository { Optional findByIdAndIsDeleteFalse(Long id); - List findByRksDaftarIsiIdAndIsDeleteFalse(Long rksDaftarIsiId); + @Query(value = "SELECT ri " + + "FROM RksIsi ri " + + "WHERE ri.isDelete = false " + + "AND ri.parentId = 0") + List findByParentRksDaftarIsi(Long rksDaftarIsiId); @Modifying @Query(value = "UPDATE rks_isi " + diff --git a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/GetListRksParentService.java b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/GetListRksParentService.java index ecdaaaf..610241d 100644 --- a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/GetListRksParentService.java +++ b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/GetListRksParentService.java @@ -24,7 +24,7 @@ public class GetListRksParentService implements BaseService rksIsiResponseList = new ArrayList<>(); - var rksIsiList = rksIsiRepository.findByRksDaftarIsiIdAndIsDeleteFalse(input.getRksDaftarIsiId()); + var rksIsiList = rksIsiRepository.findByParentRksDaftarIsi(input.getRksDaftarIsiId()); for (RksIsi rksIsi : rksIsiList) { RksIsiResponse rksIsiResponse = RksIsiResponse.builder() diff --git a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PostCreateRksIsiService.java b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PostCreateRksIsiService.java index 56a67ca..311da2d 100644 --- a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PostCreateRksIsiService.java +++ b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/PostCreateRksIsiService.java @@ -46,6 +46,7 @@ public class PostCreateRksIsiService implements BaseService