diff --git a/Api/Ewide.Core/Service/Org/SysOrgService.cs b/Api/Ewide.Core/Service/Org/SysOrgService.cs index 54052b3..6b3b8d8 100644 --- a/Api/Ewide.Core/Service/Org/SysOrgService.cs +++ b/Api/Ewide.Core/Service/Org/SysOrgService.cs @@ -358,9 +358,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) 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();