From fdd35d5e5802b4f4b6fc71a367d2b9946cfb2d72 Mon Sep 17 00:00:00 2001
From: zhangqi <2794379662@qq.com>
Date: Mon, 28 Jun 2021 17:44:22 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E7=A7=BB=E5=8A=A8=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E5=88=B0UserManager?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HouseSafety/HouseMember/HouseMemberService.cs        | 2 +-
 Api/Ewide.Core/Controller/AreaCodeController.cs          | 6 ++----
 Api/Ewide.Core/Manager/IUserManager.cs                   | 5 ++++-
 Api/Ewide.Core/Manager/UserManager.cs                    | 9 ++++++++-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs
index ad44a3e..c0fff75 100644
--- a/Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs
+++ b/Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs
@@ -49,7 +49,7 @@ namespace Ewide.Application.Service
         [HttpPost("/houseMember/page")]
         public async Task<dynamic> QueryMemberPageList([FromBody] UserInput input)
         {
-            var dataScopes = await _sysUserService.GetUserDataScopeIdList(_userManager.UserId);
+            var dataScopes = await _userManager.GetUserDataScopeIdList();
 
             var sql = @"SELECT
 SU.*,
diff --git a/Api/Ewide.Core/Controller/AreaCodeController.cs b/Api/Ewide.Core/Controller/AreaCodeController.cs
index 32b93f1..ae75fd5 100644
--- a/Api/Ewide.Core/Controller/AreaCodeController.cs
+++ b/Api/Ewide.Core/Controller/AreaCodeController.cs
@@ -19,13 +19,11 @@ namespace Ewide.Core.Controller
     public class AreaCodeController : IDynamicApiController
     {
         private readonly IAreaCodeService _areaCodeService;
-        private readonly ISysUserService _sysUserService;
         private readonly IUserManager _userManager;
-        public AreaCodeController(IAreaCodeService areaCodeService, IUserManager userManager, ISysUserService sysUserService)
+        public AreaCodeController(IAreaCodeService areaCodeService, IUserManager userManager)
         {
             _areaCodeService = areaCodeService;
             _userManager = userManager;
-            _sysUserService = sysUserService;
         }
         /// <summary>
         /// 查询
@@ -88,7 +86,7 @@ namespace Ewide.Core.Controller
             List<string> areaCodeList = null;
             if (!_userManager.SuperAdmin)
             {
-                var orgIdList = await _sysUserService.GetUserDataScopeIdList(_userManager.UserId);
+                var orgIdList = await _userManager.GetUserDataScopeIdList();
                 areaCodeList = await _areaCodeService.GetAreaCodeListByOrgId(orgIdList);
             }
             return await _areaCodeService.GetAreaCodeTree(level, areaCodeList);
diff --git a/Api/Ewide.Core/Manager/IUserManager.cs b/Api/Ewide.Core/Manager/IUserManager.cs
index f3dfa55..7c298fe 100644
--- a/Api/Ewide.Core/Manager/IUserManager.cs
+++ b/Api/Ewide.Core/Manager/IUserManager.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using Ewide.Core.Entity;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace Ewide.Core
@@ -22,5 +24,6 @@ namespace Ewide.Core
         Task<List<SysRole>> GetUserRoleList(string userId);
         Task<List<SysRole>> GetUserRoleList();
         Task<List<string>> GetLoginPermissionList();
+        Task<List<string>> GetUserDataScopeIdList();
     }
 }
\ No newline at end of file
diff --git a/Api/Ewide.Core/Manager/UserManager.cs b/Api/Ewide.Core/Manager/UserManager.cs
index 19f16c8..37cd958 100644
--- a/Api/Ewide.Core/Manager/UserManager.cs
+++ b/Api/Ewide.Core/Manager/UserManager.cs
@@ -22,6 +22,7 @@ namespace Ewide.Core
         private readonly IRepository<SysOrg> _sysOrgRep;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly ISysMenuService _sysMenuService;
+        private readonly ISysUserService _sysUserService;
 
         public string UserId
         {
@@ -55,7 +56,8 @@ namespace Ewide.Core
             IRepository<SysEmp> sysEmpRep,
             IRepository<SysOrg> sysOrgRep,
             IHttpContextAccessor httpContextAccessor,
-            ISysMenuService sysMenuService)
+            ISysMenuService sysMenuService,
+            ISysUserService sysUserService)
         {
             _sysUserRep = sysUserRep;
             _sysRoleRep = sysRoleRep;
@@ -64,6 +66,7 @@ namespace Ewide.Core
             _sysOrgRep = sysOrgRep;
             _httpContextAccessor = httpContextAccessor;
             _sysMenuService = sysMenuService;
+            _sysUserService = sysUserService;
         }
 
         /// <summary>
@@ -172,5 +175,9 @@ namespace Ewide.Core
         {
             return _sysMenuService.GetLoginPermissionList(UserId);
         }
+        public Task<List<string>> GetUserDataScopeIdList()
+        {
+            return _sysUserService.GetUserDataScopeIdList(UserId);
+        }
     }
 }
\ No newline at end of file