新增人事管理板块-组织架构、员工、职位

Admin.Core.Model/Admin/EmployeeEntity.cs → Admin.Core.Model/Personnel/EmployeeEntity.cs

@@ -1,14 +1,14 @@
 using Admin.Core.Common.BaseModel;
+using Admin.Core.Model.Admin;
 using FreeSql.DataAnnotations;
 using System;
-using System.Collections.Generic;
 
-namespace Admin.Core.Model.Admin
+namespace Admin.Core.Model.Personnel
 {
     /// <summary>
     /// 员工
     /// </summary>
-	[Table(Name = "ad_employee")]
+	[Table(Name = "pe_employee")]
     [Index("idx_{tablename}_01", nameof(EmpNo) + "," + nameof(TenantId), true)]
     public class EmployeeEntity : EntityFull, ITenant
     {

Admin.Core.Model/Admin/OrganizationEntity.cs → Admin.Core.Model/Personnel/OrganizationEntity.cs

@@ -2,12 +2,12 @@ using Admin.Core.Common.BaseModel;
 using FreeSql.DataAnnotations;
 using System.Collections.Generic;
 
-namespace Admin.Core.Model.Admin
+namespace Admin.Core.Model.Personnel
 {
     /// <summary>
-    /// 组织机构
+    /// 组织架构
     /// </summary>
-	[Table(Name = "ad_organization")]
+	[Table(Name = "pe_organization")]
     [Index("idx_{tablename}_01", nameof(ParentId) + "," + nameof(Name) + "," + nameof(TenantId), true)]
     public class OrganizationEntity : EntityFull, ITenant
     {
@@ -23,7 +23,7 @@ namespace Admin.Core.Model.Admin
 		public long ParentId { get; set; }
 
         [Navigate(nameof(ParentId))]
-        public List<DictionaryEntity> Childs { get; set; }
+        public List<OrganizationEntity> Childs { get; set; }
 
         /// <summary>
         /// 名称

Admin.Core.Model/Personnel/PositionEntity.cs

@@ -0,0 +1,49 @@
+using Admin.Core.Common.BaseModel;
+using FreeSql.DataAnnotations;
+using System;
+
+namespace Admin.Core.Model.Personnel
+{
+    /// <summary>
+    /// 职位
+    /// </summary>
+	[Table(Name = "pe_position")]
+    [Index("idx_{tablename}_01", nameof(Name) + "," + nameof(TenantId), true)]
+    [Index("idx_{tablename}_02", nameof(Code) + "," + nameof(TenantId), true)]
+    public class PositionEntity : EntityFull, ITenant
+    {
+        /// <summary>
+        /// 租户Id
+        /// </summary>
+        [Column(Position = -10, CanUpdate = false)]
+        public long? TenantId { get; set; }
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 编码
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 说明
+        /// </summary>
+        [Column(StringLength = 200)]
+        public string Description { get; set; }
+
+        /// <summary>
+        /// 启用
+        /// </summary>
+		public bool Enabled { get; set; } = true;
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+		public int Sort { get; set; }
+    }
+}

Admin.Core.Repository/Base/Data.cs

@@ -1,4 +1,5 @@
 using Admin.Core.Model.Admin;
+using Admin.Core.Model.Personnel;
 
 namespace Admin.Core.Repository
 {
@@ -12,7 +13,6 @@ namespace Admin.Core.Repository
         public ApiEntity[] ApiTree { get; set; }
         public ViewEntity[] ViewTree { get; set; }
         public PermissionEntity[] PermissionTree { get; set; }
-        public OrganizationEntity[] OrganizationTree { get; set; }
         public UserEntity[] Users { get; set; }
         public RoleEntity[] Roles { get; set; }
         public UserRoleEntity[] UserRoles { get; set; }
@@ -20,5 +20,7 @@ namespace Admin.Core.Repository
         public TenantEntity[] Tenants { get; set; }
         public TenantPermissionEntity[] TenantPermissions { get; set; }
         public PermissionApiEntity[] PermissionApis { get; set; }
+
+        public OrganizationEntity[] OrganizationTree { get; set; }
     }
 }

Admin.Core.Repository/Base/DbHelper.cs

@@ -5,9 +5,11 @@ using Admin.Core.Common.Configs;
 using Admin.Core.Common.Extensions;
 using Admin.Core.Common.Helpers;
 using Admin.Core.Model.Admin;
+using Admin.Core.Model.Personnel;
 using Admin.Core.Repository.Admin.Output;
 using Admin.Core.Repository.Admin.Permission.Output;
 using Admin.Core.Repository.Admin.View.Output;
+using Admin.Core.Repository.Personnel.Output;
 using FreeSql;
 using FreeSql.Aop;
 using FreeSql.DataAnnotations;
@@ -524,25 +526,6 @@ namespace Admin.Core.Repository
 
                 #endregion
 
-                #region 组织机构
-
-                var organizations = await db.Queryable<OrganizationEntity>().ToListAsync<OrganizationDataOutput>();
-                var organizationTree = organizations.ToTree((r, c) =>
-                {
-                    return c.ParentId == 0;
-                },
-                (r, c) =>
-                {
-                    return r.Id == c.ParentId;
-                },
-                (r, datalist) =>
-                {
-                    r.Childs ??= new List<OrganizationDataOutput>();
-                    r.Childs.AddRange(datalist);
-                });
-
-                #endregion
-
                 #region 用户
 
                 var users = await db.Queryable<UserEntity>().ToListAsync(a => new
@@ -584,8 +567,6 @@ namespace Admin.Core.Repository
 
                 #endregion
 
-               
-
                 #region 角色权限
 
                 var rolePermissions = await db.Queryable<RolePermissionEntity>().ToListAsync(a => new
@@ -642,6 +623,26 @@ namespace Admin.Core.Repository
 
                 #endregion
 
+
+                #region 组织机构
+
+                var organizations = await db.Queryable<OrganizationEntity>().ToListAsync<OrganizationDataOutput>();
+                var organizationTree = organizations.ToTree((r, c) =>
+                {
+                    return c.ParentId == 0;
+                },
+                (r, c) =>
+                {
+                    return r.Id == c.ParentId;
+                },
+                (r, datalist) =>
+                {
+                    r.Childs ??= new List<OrganizationDataOutput>();
+                    r.Childs.AddRange(datalist);
+                });
+
+                #endregion
+
                 #endregion
 
                 if (!(users?.Count > 0))

Admin.Core.Repository/Admin/Organization/IOrganizationRepository.cs → Admin.Core.Repository/Personnel/Organization/IOrganizationRepository.cs

@@ -1,6 +1,6 @@
-using Admin.Core.Model.Admin;
+using Admin.Core.Model.Personnel;
 
-namespace Admin.Core.Repository.Admin
+namespace Admin.Core.Repository.Personnel
 {
     public partial interface IOrganizationRepository : IRepositoryBase<OrganizationEntity>
     {

Admin.Core.Repository/Admin/Organization/OrganizationRepository.cs → Admin.Core.Repository/Personnel/Organization/OrganizationRepository.cs

@@ -1,6 +1,6 @@
-using Admin.Core.Model.Admin;
+using Admin.Core.Model.Personnel;
 
-namespace Admin.Core.Repository.Admin
+namespace Admin.Core.Repository.Personnel
 {
     public class OrganizationRepository : RepositoryBase<OrganizationEntity>, IOrganizationRepository
     {

Admin.Core.Repository/Admin/Organization/Output/OrganizationDataOutput.cs → Admin.Core.Repository/Personnel/Organization/Output/OrganizationDataOutput.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Admin.Core.Repository.Admin.Output
+namespace Admin.Core.Repository.Personnel.Output
 {
     /// <summary>
     /// 组织机构数据导出

Admin.Core.Service/Admin/Organization/Output/OrganizationGetOutput.cs

@@ -1,8 +0,0 @@
-using Admin.Core.Service.Admin.Organization.Input;
-
-namespace Admin.Core.Service.Admin.Organization.Output
-{
-    public class OrganizationGetOutput : OrganizationUpdateInput
-    {
-    }
-}

Admin.Core.Service/Admin/Organization/IOrganizationService.cs → Admin.Core.Service/Personnel/Organization/IOrganizationService.cs

@@ -1,10 +1,10 @@
 using Admin.Core.Common.Input;
 using Admin.Core.Common.Output;
-using Admin.Core.Model.Admin;
-using Admin.Core.Service.Admin.Organization.Input;
+using Admin.Core.Model.Personnel;
+using Admin.Core.Service.Personnel.Organization.Input;
 using System.Threading.Tasks;
 
-namespace Admin.Core.Service.Admin.Organization
+namespace Admin.Core.Service.Personnel.Organization
 {
     public partial interface IOrganizationService
     {

Admin.Core.Service/Admin/Organization/Input/OrganizationAddInput.cs → Admin.Core.Service/Personnel/Organization/Input/OrganizationAddInput.cs

@@ -1,4 +1,4 @@
-namespace Admin.Core.Service.Admin.Organization.Input
+namespace Admin.Core.Service.Personnel.Organization.Input
 {
     /// <summary>
     /// 添加

Admin.Core.Service/Admin/Organization/Input/OrganizationUpdateInput.cs → Admin.Core.Service/Personnel/Organization/Input/OrganizationUpdateInput.cs

@@ -1,4 +1,4 @@
-namespace Admin.Core.Service.Admin.Organization.Input
+namespace Admin.Core.Service.Personnel.Organization.Input
 {
     /// <summary>
     /// 修改

Admin.Core.Service/Admin/Organization/OrganizationService.cs → Admin.Core.Service/Personnel/Organization/OrganizationService.cs

@@ -1,12 +1,12 @@
 using Admin.Core.Common.Input;
 using Admin.Core.Common.Output;
-using Admin.Core.Model.Admin;
-using Admin.Core.Repository.Admin;
-using Admin.Core.Service.Admin.Organization.Input;
-using Admin.Core.Service.Admin.Organization.Output;
+using Admin.Core.Model.Personnel;
+using Admin.Core.Repository.Personnel;
+using Admin.Core.Service.Personnel.Organization.Input;
+using Admin.Core.Service.Personnel.Organization.Output;
 using System.Threading.Tasks;
 
-namespace Admin.Core.Service.Admin.Organization
+namespace Admin.Core.Service.Personnel.Organization
 {
     public class OrganizationService : BaseService, IOrganizationService
     {

Admin.Core.Service/Personnel/Organization/Output/OrganizationGetOutput.cs

@@ -0,0 +1,8 @@
+using Admin.Core.Service.Personnel.Organization.Input;
+
+namespace Admin.Core.Service.Personnel.Organization.Output
+{
+    public class OrganizationGetOutput : OrganizationUpdateInput
+    {
+    }
+}

Admin.Core.Service/Admin/Organization/Output/OrganizationListOutput.cs → Admin.Core.Service/Personnel/Organization/Output/OrganizationListOutput.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Admin.Core.Service.Admin.Organization.Output
+namespace Admin.Core.Service.Personnel.Organization.Output
 {
     public class OrganizationListOutput
     {

Admin.Core.Service/Admin/Organization/_MapConfig.cs → Admin.Core.Service/Personnel/Organization/_MapConfig.cs

@@ -1,8 +1,8 @@
-using Admin.Core.Model.Admin;
-using Admin.Core.Service.Admin.Organization.Input;
+using Admin.Core.Model.Personnel;
+using Admin.Core.Service.Personnel.Organization.Input;
 using AutoMapper;
 
-namespace Admin.Core.Service.Admin.Organization
+namespace Admin.Core.Service.Personnel.Organization
 {
     /// <summary>
     /// 映射配置

Admin.Core/Admin.Core.Model.xml

@@ -194,26 +194,6 @@
             主键Id
             </summary>
         </member>
-        <member name="T:Admin.Core.Model.Admin.EmployeeEntity">
-            <summary>
-            员工
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.EmployeeEntity.TenantId">
-            <summary>
-            租户Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.EmployeeEntity.EmpNo">
-            <summary>
-            工号
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.EmployeeEntity.OrganizationId">
-            <summary>
-            部门Id
-            </summary>
-        </member>
         <member name="T:Admin.Core.Model.Admin.LogAbstract">
             <summary>
             日志
@@ -304,51 +284,6 @@
             操作参数
             </summary>
         </member>
-        <member name="T:Admin.Core.Model.Admin.OrganizationEntity">
-            <summary>
-            组织机构
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.OrganizationEntity.TenantId">
-            <summary>
-            租户Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.OrganizationEntity.ParentId">
-            <summary>
-            父级
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.OrganizationEntity.Name">
-            <summary>
-            名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.OrganizationEntity.Code">
-            <summary>
-            编码
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.OrganizationEntity.Value">
-            <summary>
-            值
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.OrganizationEntity.Description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.OrganizationEntity.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Model.Admin.OrganizationEntity.Sort">
-            <summary>
-            排序
-            </summary>
-        </member>
         <member name="T:Admin.Core.Model.Admin.PermissionApiEntity">
             <summary>
             权限接口
@@ -734,5 +669,70 @@
             排序
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.Personnel.EmployeeEntity">
+            <summary>
+            员工
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.EmployeeEntity.TenantId">
+            <summary>
+            租户Id
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.EmployeeEntity.EmpNo">
+            <summary>
+            工号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.EmployeeEntity.OrganizationId">
+            <summary>
+            部门Id
+            </summary>
+        </member>
+        <member name="T:Admin.Core.Model.Personnel.OrganizationEntity">
+            <summary>
+            组织架构
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.OrganizationEntity.TenantId">
+            <summary>
+            租户Id
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.OrganizationEntity.ParentId">
+            <summary>
+            父级
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.OrganizationEntity.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.OrganizationEntity.Code">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.OrganizationEntity.Value">
+            <summary>
+            值
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.OrganizationEntity.Description">
+            <summary>
+            描述
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.OrganizationEntity.Enabled">
+            <summary>
+            启用
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.Personnel.OrganizationEntity.Sort">
+            <summary>
+            排序
+            </summary>
+        </member>
     </members>
 </doc>

Admin.Core/Admin.Core.Service.xml

@@ -930,101 +930,6 @@
             映射配置
             </summary>
         </member>
-        <member name="T:Admin.Core.Service.Admin.Organization.Input.OrganizationAddInput">
-            <summary>
-            添加
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Input.OrganizationAddInput.ParentId">
-            <summary>
-            父级
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Input.OrganizationAddInput.Name">
-            <summary>
-            名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Input.OrganizationAddInput.Code">
-            <summary>
-            编码
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Input.OrganizationAddInput.Value">
-            <summary>
-            值
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Input.OrganizationAddInput.Description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Input.OrganizationAddInput.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Organization.Input.OrganizationUpdateInput">
-            <summary>
-            修改
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Input.OrganizationUpdateInput.Id">
-            <summary>
-            主键Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Input.OrganizationUpdateInput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Output.OrganizationListOutput.Id">
-            <summary>
-            主键Id
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Output.OrganizationListOutput.ParentId">
-            <summary>
-            父级
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Output.OrganizationListOutput.Name">
-            <summary>
-            名称
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Output.OrganizationListOutput.Code">
-            <summary>
-            编码
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Output.OrganizationListOutput.Value">
-            <summary>
-            值
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Output.OrganizationListOutput.Description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Output.OrganizationListOutput.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
-        <member name="P:Admin.Core.Service.Admin.Organization.Output.OrganizationListOutput.CreatedTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="T:Admin.Core.Service.Admin.Organization.MapConfig">
-            <summary>
-            映射配置
-            </summary>
-        </member>
         <member name="P:Admin.Core.Service.Admin.Permission.Input.PermissionAddApiInput.Type">
             <summary>
             权限类型
@@ -1858,5 +1763,100 @@
             日志
             </summary>
         </member>
+        <member name="T:Admin.Core.Service.Personnel.Organization.Input.OrganizationAddInput">
+            <summary>
+            添加
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Input.OrganizationAddInput.ParentId">
+            <summary>
+            父级
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Input.OrganizationAddInput.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Input.OrganizationAddInput.Code">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Input.OrganizationAddInput.Value">
+            <summary>
+            值
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Input.OrganizationAddInput.Description">
+            <summary>
+            描述
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Input.OrganizationAddInput.Enabled">
+            <summary>
+            启用
+            </summary>
+        </member>
+        <member name="T:Admin.Core.Service.Personnel.Organization.Input.OrganizationUpdateInput">
+            <summary>
+            修改
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Input.OrganizationUpdateInput.Id">
+            <summary>
+            主键Id
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Input.OrganizationUpdateInput.Version">
+            <summary>
+            版本
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Output.OrganizationListOutput.Id">
+            <summary>
+            主键Id
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Output.OrganizationListOutput.ParentId">
+            <summary>
+            父级
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Output.OrganizationListOutput.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Output.OrganizationListOutput.Code">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Output.OrganizationListOutput.Value">
+            <summary>
+            值
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Output.OrganizationListOutput.Description">
+            <summary>
+            描述
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Output.OrganizationListOutput.Enabled">
+            <summary>
+            启用
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Service.Personnel.Organization.Output.OrganizationListOutput.CreatedTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="T:Admin.Core.Service.Personnel.Organization.MapConfig">
+            <summary>
+            映射配置
+            </summary>
+        </member>
     </members>
 </doc>

Admin.Core/Admin.Core.xml

@@ -375,46 +375,6 @@
             <param name="model"></param>
             <returns></returns>
         </member>
-        <member name="T:Admin.Core.Controllers.Admin.OrganizationController">
-            <summary>
-            组织机构
-            </summary>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.OrganizationController.Get(System.Int64)">
-            <summary>
-            查询单条组织机构
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.OrganizationController.GetPage(Admin.Core.Common.Input.PageInput{Admin.Core.Model.Admin.OrganizationEntity})">
-            <summary>
-            查询分页组织机构
-            </summary>
-            <param name="model"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.OrganizationController.Add(Admin.Core.Service.Admin.Organization.Input.OrganizationAddInput)">
-            <summary>
-            新增组织机构
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.OrganizationController.Update(Admin.Core.Service.Admin.Organization.Input.OrganizationUpdateInput)">
-            <summary>
-            修改组织机构
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Admin.Core.Controllers.Admin.OrganizationController.SoftDelete(System.Int64)">
-            <summary>
-            删除组织机构
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
         <member name="T:Admin.Core.Controllers.Admin.PermissionController">
             <summary>
             权限管理
@@ -797,6 +757,51 @@
             基础控制器
             </summary>
         </member>
+        <member name="T:Admin.Core.Controllers.Personnel.AreaController">
+            <summary>
+            域控制器
+            </summary>
+        </member>
+        <member name="T:Admin.Core.Controllers.Personnel.OrganizationController">
+            <summary>
+            组织机构
+            </summary>
+        </member>
+        <member name="M:Admin.Core.Controllers.Personnel.OrganizationController.Get(System.Int64)">
+            <summary>
+            查询单条组织机构
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Admin.Core.Controllers.Personnel.OrganizationController.GetPage(Admin.Core.Common.Input.PageInput{Admin.Core.Model.Personnel.OrganizationEntity})">
+            <summary>
+            查询分页组织机构
+            </summary>
+            <param name="model"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Admin.Core.Controllers.Personnel.OrganizationController.Add(Admin.Core.Service.Personnel.Organization.Input.OrganizationAddInput)">
+            <summary>
+            新增组织机构
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Admin.Core.Controllers.Personnel.OrganizationController.Update(Admin.Core.Service.Personnel.Organization.Input.OrganizationUpdateInput)">
+            <summary>
+            修改组织机构
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Admin.Core.Controllers.Personnel.OrganizationController.SoftDelete(System.Int64)">
+            <summary>
+            删除组织机构
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="M:Admin.Core.Db.DBServiceCollectionExtensions.AddDbAsync(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Hosting.IHostEnvironment)">
             <summary>
             添加数据库

Admin.Core/Controllers/Personnel/AreaController.cs

@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace Admin.Core.Controllers.Personnel
+{
+    /// <summary>
+    /// 域控制器
+    /// </summary>
+    [Area("Personnel")]
+    public abstract class AreaController : BaseController
+    {
+    }
+}

Admin.Core/Controllers/Admin/OrganizationController.cs → Admin.Core/Controllers/Personnel/OrganizationController.cs

@@ -1,12 +1,12 @@
 using Admin.Core.Common.Input;
 using Admin.Core.Common.Output;
-using Admin.Core.Model.Admin;
-using Admin.Core.Service.Admin.Organization;
-using Admin.Core.Service.Admin.Organization.Input;
+using Admin.Core.Model.Personnel;
+using Admin.Core.Service.Personnel.Organization;
+using Admin.Core.Service.Personnel.Organization.Input;
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 
-namespace Admin.Core.Controllers.Admin
+namespace Admin.Core.Controllers.Personnel
 {
     /// <summary>
     /// 组织机构