修改角色回显问题

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DeptRepository.java

@@ -49,7 +49,7 @@ public interface DeptRepository extends JpaRepository<Dept, String>, JpaSpecific
      */
     @Query(value = "select d.* from sys_dept d, sys_roles_depts r where " +
             "d.dept_id = r.dept_id and r.role_id = ?1", nativeQuery = true)
-    Set<Dept> findByRoleId(String roleId);
+    Set<Dept> findByRoleId(Long roleId);
 
     /**
      * 判断是否存在子节点

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java

@@ -65,7 +65,7 @@ public interface MenuRepository extends JpaRepository<Menu, String>, JpaSpecific
      */
     @Query(value = "SELECT m.* FROM sys_menu m, sys_roles_menus r WHERE " +
             "m.menu_id = r.menu_id AND r.role_id IN ?1 AND type != ?2 order by m.menu_sort asc",nativeQuery = true)
-    LinkedHashSet<Menu> findByRoleIdsAndTypeNot(Set<String> roleIds, int type);
+    LinkedHashSet<Menu> findByRoleIdsAndTypeNot(Set<Long> roleIds, int type);
 
     /**
      * 获取节点数量

eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java

@@ -111,7 +111,7 @@ public interface DeptService {
      * @param id /
      * @return /
      */
-    Set<Dept> findByRoleId(String id);
+    Set<Dept> findByRoleId(Long id);
 
     /**
      * 导出数据

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDto.java

@@ -25,7 +25,7 @@ import java.io.Serializable;
 @Data
 public class RoleSmallDto implements Serializable {
 
-    private String id;
+    private Long id;
 
     private String name;
 

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java

@@ -161,7 +161,7 @@ public class DeptServiceImpl implements DeptService {
     }
 
     @Override
-    public Set<Dept> findByRoleId(String id) {
+    public Set<Dept> findByRoleId(Long id) {
         return deptRepository.findByRoleId(id);
     }
 

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java

@@ -98,7 +98,7 @@ public class MenuServiceImpl implements MenuService {
     @Cacheable(key = "'user:' + #p0")
     public List<MenuDto> findByUser(String currentUserId) {
         List<RoleSmallDto> roles = roleService.findByUsersId(currentUserId);
-        Set<String> roleIds = roles.stream().map(RoleSmallDto::getId).collect(Collectors.toSet());
+        Set<Long> roleIds = roles.stream().map(RoleSmallDto::getId).collect(Collectors.toSet());
         LinkedHashSet<Menu> menus = menuRepository.findByRoleIdsAndTypeNot(roleIds, 2);
         return menus.stream().map(menuMapper::toDto).collect(Collectors.toList());
     }