diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/IDeptService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/IDeptService.cs index 932819ff..496848c8 100644 --- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/IDeptService.cs +++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/IDeptService.cs @@ -9,6 +9,5 @@ namespace Yi.Furion.Application.Rbac.Services public interface IDeptService : ICrudAppService { Task> GetChildListAsync(long deptId); - Task> GetListRoleIdAsync([FromRoute] long roleId); } } diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/DeptService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/DeptService.cs index 42a38b6a..28f7bc34 100644 --- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/DeptService.cs +++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/DeptService.cs @@ -26,7 +26,7 @@ namespace Yi.Furion.Application.Rbac.Services.Impl /// /// //[Route("{roleId}")] - public async Task> GetListRoleIdAsync([FromRoute] long roleId) + public async Task> GetRoleIdAsync([FromRoute] long roleId) { var entities = await _deptRepository.GetListRoleIdAsync(roleId); return await MapToGetListOutputDtosAsync(entities); diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Yi.Furion.Application.xml b/Yi.Furion.Net6/Yi.Furion.Application/Yi.Furion.Application.xml index f87daa3f..dd0d09be 100644 --- a/Yi.Furion.Net6/Yi.Furion.Application/Yi.Furion.Application.xml +++ b/Yi.Furion.Net6/Yi.Furion.Application/Yi.Furion.Application.xml @@ -379,7 +379,7 @@ Dept服务实现 - + 通过角色id查询该角色全部部门 diff --git a/Yi.RuoYi.Vue3/src/api/system/dept.js b/Yi.RuoYi.Vue3/src/api/system/dept.js index 212f8ea5..7a2721cc 100644 --- a/Yi.RuoYi.Vue3/src/api/system/dept.js +++ b/Yi.RuoYi.Vue3/src/api/system/dept.js @@ -55,7 +55,7 @@ export function delDept(deptId) { // 根据角色ID查询菜单下拉树结构 export function roleDeptTreeselect(roleId) { return request({ - url: '/role/dept-ids/' + roleId, + url: '/dept/role-id/' + roleId, method: 'get' }) } \ No newline at end of file diff --git a/Yi.RuoYi.Vue3/src/views/system/role/index.vue b/Yi.RuoYi.Vue3/src/views/system/role/index.vue index 5eff5d7a..e2256395 100644 --- a/Yi.RuoYi.Vue3/src/views/system/role/index.vue +++ b/Yi.RuoYi.Vue3/src/views/system/role/index.vue @@ -439,7 +439,7 @@ function getDeptTree(roleId) { let deptIds = []; roleDeptTreeselect(roleId).then((response) => { - deptIds = response.data; + deptIds = response.data.map(x=>x.id); // nextTick(() => { if (deptRef.value) { deptRef.value.setCheckedKeys(deptIds);