ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update 规范化所有区域相关字段

Browse Source
This commit is contained in:
自带大佬气场
2021-04-30 10:53:38 +08:00
parent 73001d5f8a
commit 2cdf62eeb5
13 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Api/Ewide.Core/Service/User/SysUserAreaService.cs
View File

@@ -22,7 +22,7 @@ namespace Ewide.Core.Service.User
public async Task DeleteUserAreaListByAreaCodeList(List<string> areaCodeList)
{
var areaList = await _sysUserAreaRep.DetachedEntities.Where(ua => areaCodeList.Contains(ua.AreaNumberCode)).ToListAsync();
var areaList = await _sysUserAreaRep.DetachedEntities.Where(ua => areaCodeList.Contains(ua.AreaCode)).ToListAsync();
foreach (var area in areaList)
{
area.Delete();
@@ -40,7 +40,7 @@ namespace Ewide.Core.Service.User
public async Task<List<string>> GetUserAreaIdList(string userId)
{
return await _sysUserAreaRep.DetachedEntities.Where(ua => ua.SysUserId == userId).Select(ua => ua.AreaNumberCode).ToListAsync();
return await _sysUserAreaRep.DetachedEntities.Where(ua => ua.SysUserId == userId).Select(ua => ua.AreaCode).ToListAsync();
}
public async Task GrantData(UpdateUserInput input)
@@ -56,7 +56,7 @@ namespace Ewide.Core.Service.User
new SysUserArea
{
SysUserId = input.Id,
AreaNumberCode = u
AreaCode = u
}.Insert();
});
}

6
Api/Ewide.Core/Service/User/SysUserDataScopeService.cs
View File

@@ -56,7 +56,7 @@ namespace Ewide.Core.Service
new SysUserArea
{
SysUserId = input.Id,
AreaNumberCode = u
AreaCode = u
}.Insert();
});
@@ -70,12 +70,12 @@ namespace Ewide.Core.Service
/// <returns></returns>
public async Task<List<string>> GetUserDataScopeIdList(string userId)
{
var areaList = await _sysUserAreaRep.DetachedEntities.Where(u => u.SysUserId == userId).Select(u => u.AreaNumberCode).ToListAsync();
var areaList = await _sysUserAreaRep.DetachedEntities.Where(u => u.SysUserId == userId).Select(u => u.AreaCode).ToListAsync();
//用户自定义的区域权限所对应的全部组织机构id
List<string> areaDataScopeIdList = new List<string>();
foreach (var areaNumberCode in areaList)
{
areaDataScopeIdList.AddRange(await _sysOrgRep.DetachedEntities.Where(p => p.AreaNumberCode == areaNumberCode).Select(p => p.Id).ToListAsync());
areaDataScopeIdList.AddRange(await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode == areaNumberCode).Select(p => p.Id).ToListAsync());
}
//用户自定义的组织权限
var orgIdList = await _sysUserDataScopeRep.DetachedEntities