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

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

View File

@@ -43,7 +43,7 @@ namespace Ewide.Core.Service.Area
public async Task DeleteAreaCode(DeleteAreaCodeInput input)
{
var AreaCode = await _areaCodeRep.FirstOrDefaultAsync(p => p.Code == input.Code);
if (await _sysOrgRep.DetachedEntities.AnyAsync(o => o.AreaNumberCode == input.Code))
if (await _sysOrgRep.DetachedEntities.AnyAsync(o => o.AreaCode == input.Code))
{
throw Oops.Oh("不能删除已包含区域的组织");
}
@@ -97,7 +97,7 @@ namespace Ewide.Core.Service.Area
var AreaCodes = await _areaCodeRep.DetachedEntities
.Where(input.LevelType.HasValue, a => a.LevelType == input.LevelType)
.Where(!string.IsNullOrEmpty(input.Code), a => a.Code.StartsWith(input.Code))
.Where(!string.IsNullOrEmpty(input.ShowCode), a => a.ShowCode.StartsWith(input.ShowCode))
.Where(!string.IsNullOrEmpty(input.ShowCode), a => a.AdCode.StartsWith(input.ShowCode))
.Where(!string.IsNullOrEmpty(input.Name), a => a.Name.StartsWith(input.Name))
.ToPageData(input);
return XnPageResult<SysAreaCode>.PageResult(AreaCodes);