From 0822b568221d653b3b013209f18cf9d384654e8a Mon Sep 17 00:00:00 2001
From: zhangqi <2794379662@qq.com>
Date: Mon, 26 Apr 2021 13:11:02 +0800
Subject: [PATCH] =?UTF-8?q?feature:=E7=BB=84=E7=BB=87=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8C=BA=E5=9F=9F=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Api/Ewide.Core/Entity/SysOrg.cs      | 11 ++++++++++-
 Api/Ewide.Core/Enum/DataScopeType.cs | 12 +++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

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; }
 
+
         /// <summary>
         /// 状态（字典 0正常 1停用 2删除）
         /// </summary>
         [Comment("状态")]
         public CommonStatus Status { get; set; } = CommonStatus.ENABLE;
 
+        [Comment("组织所在区域代码")]
+        public string AreaNumberCode { get; set; }
+        /// <summary>
+        /// 一对一 一个组织对应一个区域代码
+        /// </summary>
+        public AreaNumber AreaNumber { get; set; }
+
         /// <summary>
         /// 多对多（用户）
         /// </summary>
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
         /// 自定义数据
         /// </summary>
         [Description("自定义数据")]
-        DEFINE = 5
+        DEFINE = 5,
+        /// <summary>
+        /// 本部门所在区域及以下区域
+        /// </summary>
+        [Description("本部门所在区域及以下区域")]
+        AREA_WITH_CHILD = 6,
+        /// <summary>
+        /// 本部门所在区域数据 不包括下面区域
+        /// </summary>
+        [Description("仅本部门所在区域数据")]
+        AREA = 7,
     }
 }