diff --git a/src/main/java/com/iconplus/smartproc/repository/MenusRepository.java b/src/main/java/com/iconplus/smartproc/repository/MenusRepository.java index 33ae8f9..82f63df 100644 --- a/src/main/java/com/iconplus/smartproc/repository/MenusRepository.java +++ b/src/main/java/com/iconplus/smartproc/repository/MenusRepository.java @@ -17,10 +17,12 @@ public interface MenusRepository extends JpaRepository { @Query(value = "SELECT m " + "FROM Menus m " + + "JOIN Permission p ON p.menuId = m.id " + "WHERE m.parentId = 0 " + "AND m.isDelete = false " + + "AND p.roleId = :roleId " + "ORDER BY m.urutan") - List findAllParentMenu(); + List findAllParentMenu(Long roleId); @Query(value = "SELECT m " + 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 253e99c..d00c7bb 100644 --- a/src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java +++ b/src/main/java/com/iconplus/smartproc/service/authentication/LoginService.java @@ -81,7 +81,7 @@ public class LoginService implements BaseService { List parentMenusResponseList = new ArrayList<>(); - var parentMenu = menusRepository.findAllParentMenu(); + var parentMenu = menusRepository.findAllParentMenu(userRoleView.getRoleId()); for (Menus menus : parentMenu) { ParentMenusResponse parentMenusResponse = ParentMenusResponse.builder() .id(menus.getId())