From 4a5734735a5a735c8665c02dfacdd7dd00a41572 Mon Sep 17 00:00:00 2001 From: zhangqi <2794379662@qq.com> Date: Tue, 1 Jun 2021 10:09:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=B8=8D=E6=98=AF=E6=9F=A5=E6=89=BE?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BB=A3=E7=A0=81=E8=80=8C=E6=98=AF=E6=89=80?= =?UTF-8?q?=E5=9C=A8=E5=8C=BA=E5=9F=9F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Api/Ewide.Core/Service/Org/SysOrgService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Api/Ewide.Core/Service/Org/SysOrgService.cs b/Api/Ewide.Core/Service/Org/SysOrgService.cs index ee7be0e..c2b935c 100644 --- a/Api/Ewide.Core/Service/Org/SysOrgService.cs +++ b/Api/Ewide.Core/Service/Org/SysOrgService.cs @@ -361,9 +361,9 @@ namespace Ewide.Core.Service { var org = await _sysOrgRep.FirstOrDefaultAsync(o => o.Id == orgId); if (dataScopeType == (int)DataScopeType.AREA_WITH_CHILD) - return await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode.StartsWith(org.Code)).Select(p => p.Id).ToListAsync(); + return await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode.StartsWith(org.AreaCode)).Select(p => p.Id).ToListAsync(); if (dataScopeType == (int)DataScopeType.AREA) - return await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode == org.Code).Select(p => p.Id).ToListAsync(); + return await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode == org.AreaCode).Select(p => p.Id).ToListAsync(); return new List(); } public async Task> GetAreaDataScopeIdListWithoutChildrenArea(string areaNumberCode) From 16695f98f73866d164784d23d75d6218c09f4146 Mon Sep 17 00:00:00 2001 From: zhangqi <2794379662@qq.com> Date: Tue, 1 Jun 2021 10:27:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update:=E5=8C=85=E6=8B=AC=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Api/Ewide.Core/Service/User/SysUserDataScopeService.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Api/Ewide.Core/Service/User/SysUserDataScopeService.cs b/Api/Ewide.Core/Service/User/SysUserDataScopeService.cs index 6028804..db02381 100644 --- a/Api/Ewide.Core/Service/User/SysUserDataScopeService.cs +++ b/Api/Ewide.Core/Service/User/SysUserDataScopeService.cs @@ -75,9 +75,8 @@ namespace Ewide.Core.Service List areaDataScopeIdList = new List(); foreach (var areaNumberCode in areaList) { - areaDataScopeIdList.AddRange(await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode == areaNumberCode).Select(p => p.Id).ToListAsync()); - } - //用户自定义的组织权限 + areaDataScopeIdList.AddRange(await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode.StartsWith(areaNumberCode)).Select(p => p.Id).ToListAsync()); + } //用户自定义的组织权限 var orgIdList = await _sysUserDataScopeRep.DetachedEntities .Where(u => u.SysUserId == userId) .Select(u => u.SysOrgId).ToListAsync();