diff --git a/Api/Ewide.Core/Entity/SysOrg.cs b/Api/Ewide.Core/Entity/SysOrg.cs index cfbbc63..6d70306 100644 --- a/Api/Ewide.Core/Entity/SysOrg.cs +++ b/Api/Ewide.Core/Entity/SysOrg.cs @@ -1,4 +1,5 @@ -using Microsoft.EntityFrameworkCore; +using Ewide.Core.Entity; +using Microsoft.EntityFrameworkCore; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; @@ -60,12 +61,20 @@ namespace Ewide.Core [Comment("备注")] public string Remark { get; set; } + /// /// 状态(字典 0正常 1停用 2删除) /// [Comment("状态")] public CommonStatus Status { get; set; } = CommonStatus.ENABLE; + [Comment("组织所在区域代码")] + public string AreaNumberCode { get; set; } + /// + /// 一对一 一个组织对应一个区域代码 + /// + public AreaNumber AreaNumber { get; set; } + /// /// 多对多(用户) /// diff --git a/Api/Ewide.Core/Enum/DataScopeType.cs b/Api/Ewide.Core/Enum/DataScopeType.cs index 1c83a24..b7c9077 100644 --- a/Api/Ewide.Core/Enum/DataScopeType.cs +++ b/Api/Ewide.Core/Enum/DataScopeType.cs @@ -32,6 +32,16 @@ namespace Ewide.Core /// 自定义数据 /// [Description("自定义数据")] - DEFINE = 5 + DEFINE = 5, + /// + /// 本部门所在区域及以下区域 + /// + [Description("本部门所在区域及以下区域")] + AREA_WITH_CHILD = 6, + /// + /// 本部门所在区域数据 不包括下面区域 + /// + [Description("仅本部门所在区域数据")] + AREA = 7, } }