update 组织机构新增区域选择

This commit is contained in:
2021-04-30 14:02:36 +08:00
parent fdb4b4897b
commit 7a57ba34ed
14 changed files with 106 additions and 37 deletions

View File

@@ -80,6 +80,7 @@ namespace Ewide.Core.Service.Area
return new TreeBuildUtil<AreaTreeNode>().DoTreeBuild(cachedAreaCodes.Select(u => new AreaTreeNode
{
Code = u.Code,
AdCode = u.AdCode,
ParentCode = u.ParentCode,
Name = u.Name,
LevelType = u.LevelType,
@@ -97,7 +98,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.AdCode.StartsWith(input.ShowCode))
.Where(!string.IsNullOrEmpty(input.AdCode), a => a.AdCode.StartsWith(input.AdCode))
.Where(!string.IsNullOrEmpty(input.Name), a => a.Name.StartsWith(input.Name))
.ToPageData(input);
return XnPageResult<SysAreaCode>.PageResult(AreaCodes);

View File

@@ -10,7 +10,7 @@ namespace Ewide.Core.Service.Area.Dto
public class AreaCodeInput : XnInputBase
{
public string Code { get; set; }
public string ShowCode { get; set; }
public string AdCode { get; set; }
public string Name { get; set; }
public int? LevelType { get; set; }
public string Note { get; set; }
@@ -18,7 +18,7 @@ namespace Ewide.Core.Service.Area.Dto
}
public class UpdateAreaCodeInput
{
public string ShowCode { get; set; }
public string AdCode { get; set; }
public string Name { get; set; }
public int? LevelType { get; set; }
public string Note { get; set; }