From dcbd72994408f2211a5ba06b8241d7897157b624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Mon, 22 May 2023 13:03:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Yi.Furion.Application/Rbac/Services/IDeptService.cs         | 1 -
 .../Yi.Furion.Application/Rbac/Services/Impl/DeptService.cs     | 2 +-
 Yi.Furion.Net6/Yi.Furion.Application/Yi.Furion.Application.xml  | 2 +-
 Yi.RuoYi.Vue3/src/api/system/dept.js                            | 2 +-
 Yi.RuoYi.Vue3/src/views/system/role/index.vue                   | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

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<DeptGetOutputDto, DeptGetListOutputDto, long, DeptGetListInputVo, DeptCreateInputVo, DeptUpdateInputVo>
     {
         Task<List<long>> GetChildListAsync(long deptId);
-        Task<List<DeptGetListOutputDto>> 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
         /// </summary>
         /// <returns></returns>
         //[Route("{roleId}")]
-        public async Task<List<DeptGetListOutputDto>> GetListRoleIdAsync([FromRoute] long roleId)
+        public async Task<List<DeptGetListOutputDto>> 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服务实现
             </summary>
         </member>
-        <member name="M:Yi.Furion.Application.Rbac.Services.Impl.DeptService.GetListRoleIdAsync(System.Int64)">
+        <member name="M:Yi.Furion.Application.Rbac.Services.Impl.DeptService.GetRoleIdAsync(System.Int64)">
             <summary>
             通过角色id查询该角色全部部门
             </summary>
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);