From 9620505d91c697b64ebbb122e8b74ed6349fd228 Mon Sep 17 00:00:00 2001
From: zhangqi <2794379662@qq.com>
Date: Thu, 1 Jul 2021 11:26:58 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=9D=83=E9=99=90=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=A7=BB=E5=8A=A8=E5=88=B0UserManager?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Api/Ewide.Core/Service/Role/ISysRoleService.cs |  1 +
 Api/Ewide.Core/Service/Role/SysRoleService.cs  | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Api/Ewide.Core/Service/Role/ISysRoleService.cs b/Api/Ewide.Core/Service/Role/ISysRoleService.cs
index 828a2e4..591dc89 100644
--- a/Api/Ewide.Core/Service/Role/ISysRoleService.cs
+++ b/Api/Ewide.Core/Service/Role/ISysRoleService.cs
@@ -18,6 +18,7 @@ namespace Ewide.Core.Service
         Task GrantMenu(GrantRoleMenuInput input);
         Task<List<string>> OwnData([FromQuery] QueryRoleInput input);
         Task<List<string>> OwnMenu([FromQuery] QueryRoleInput input);
+        Task<List<string>> OwnArea([FromQuery] QueryRoleInput input);
         Task<dynamic> QueryRolePageList([FromQuery] RoleInput input);
         Task UpdateRole(UpdateRoleInput input);
     }
diff --git a/Api/Ewide.Core/Service/Role/SysRoleService.cs b/Api/Ewide.Core/Service/Role/SysRoleService.cs
index 9646c1a..cdfd55b 100644
--- a/Api/Ewide.Core/Service/Role/SysRoleService.cs
+++ b/Api/Ewide.Core/Service/Role/SysRoleService.cs
@@ -306,7 +306,17 @@ namespace Ewide.Core.Service
         [HttpGet("/sysRole/ownData")]
         public async Task<List<string>> OwnData([FromQuery] QueryRoleInput input)
         {
-            return await _sysRoleDataScopeService.GetRoleDataScopeIdList(new List<string> { input.Id });
+            return await _userManager.GetRoleExtraDataScopeList(input.Id);
+        }
+        /// <summary>
+        /// 获取角色拥有区域Id集合
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet("/sysRole/ownArea")]
+        public Task<List<string>> OwnArea([FromQuery] QueryRoleInput input)
+        {
+            return  _userManager.GetRoleExtraAreaScopeList(input.Id);
         }
     }
 }