diff --git a/src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java b/src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java index 21ba256..3372e89 100644 --- a/src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java +++ b/src/main/java/com/iconplus/smartproc/repository/RksIsiRepository.java @@ -30,8 +30,8 @@ public interface RksIsiRepository extends JpaRepository { List findByRksDaftarIsiIdAndIsDeleteFalse(Long rksDaftarIsiId); @Modifying - @Query(value = "update RksIsi ri " + - "set ri.isDelete = true " + - "where ri.rksDaftarIsiId = :rksDaftarIsiId") + @Query(value = "UPDATE rks_isi " + + "SET is_delete = 1 " + + "WHERE rks_daftar_isi_id = :rksDaftarIsiId", nativeQuery = true) void deleteRksIsi(@Param("rksDaftarIsiId") Long rksDaftarIsiId); } diff --git a/src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java b/src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java index 761cac5..08feb88 100644 --- a/src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java +++ b/src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java @@ -118,6 +118,8 @@ public class LoginService implements BaseService { menusPermissionResponseList.add(menusPermissionResponse); } + parentMenusResponseList.removeIf(parentMenusResponse -> parentMenusResponse.getId().equals(menusPermissionView.getId()) && + BooleanUtils.isFalse(menusPermissionView.getCanView())); } for (ParentMenusResponse parentMenusResponse : parentMenusResponseList) { diff --git a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/DeleteRksDaftarIsiService.java b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/DeleteRksDaftarIsiService.java index 73df695..8e03d98 100644 --- a/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/DeleteRksDaftarIsiService.java +++ b/src/main/java/com/iconplus/smartproc/service/rksdaftarisi/DeleteRksDaftarIsiService.java @@ -9,6 +9,8 @@ import com.iconplus.smartproc.repository.RksIsiRepository; import com.iconplus.smartproc.util.Constants; import org.springframework.stereotype.Service; +import javax.transaction.Transactional; + @Service public class DeleteRksDaftarIsiService implements BaseService { @@ -20,6 +22,7 @@ public class DeleteRksDaftarIsiService implements BaseService