将organization缩写为org，employee更名为staff

src/hosts/ZhonTai.Host/InitData/Admin/ad_api.json

@@ -1180,7 +1180,7 @@
   {
     "id": 174219034701893,
     "label": "员工管理",
-    "path": "employee",
+    "path": "staff",
     "description": "",
     "enabled": true,
     "childs": [
@@ -1188,7 +1188,7 @@
         "id": 174219034734666,
         "parentId": 174219034701893,
         "label": "查询员工",
-        "path": "/api/admin/employee/get",
+        "path": "/api/admin/staff/get",
         "httpMethods": "get",
         "description": "",
         "enabled": true,
@@ -1198,7 +1198,7 @@
         "id": 174219034734667,
         "parentId": 174219034701893,
         "label": "查询员工列表",
-        "path": "/api/admin/employee/getpage",
+        "path": "/api/admin/staff/getpage",
         "httpMethods": "post",
         "description": "",
         "enabled": true,
@@ -1208,7 +1208,7 @@
         "id": 174219034734668,
         "parentId": 174219034701893,
         "label": "新增员工",
-        "path": "/api/admin/employee/add",
+        "path": "/api/admin/staff/add",
         "httpMethods": "post",
         "description": "",
         "enabled": true,
@@ -1218,7 +1218,7 @@
         "id": 174219034734669,
         "parentId": 174219034701893,
         "label": "修改员工",
-        "path": "/api/admin/employee/update",
+        "path": "/api/admin/staff/update",
         "httpMethods": "put",
         "description": "",
         "enabled": true,
@@ -1228,7 +1228,7 @@
         "id": 174219034734670,
         "parentId": 174219034701893,
         "label": "删除员工",
-        "path": "/api/admin/employee/softdelete",
+        "path": "/api/admin/staff/softdelete",
         "httpMethods": "delete",
         "description": "",
         "enabled": true,
@@ -1238,7 +1238,7 @@
         "id": 174219034734671,
         "parentId": 174219034701893,
         "label": "批量删除员工",
-        "path": "/api/admin/employee/batchsoftdelete",
+        "path": "/api/admin/staff/batchsoftdelete",
         "httpMethods": "put",
         "description": "",
         "enabled": true,
@@ -1249,7 +1249,7 @@
   {
     "id": 174219034718277,
     "label": "组织架构",
-    "path": "organization",
+    "path": "org",
     "description": "",
     "enabled": true,
     "childs": [
@@ -1257,7 +1257,7 @@
         "id": 174219034734672,
         "parentId": 174219034718277,
         "label": "查询组织架构",
-        "path": "/api/admin/organization/get",
+        "path": "/api/admin/org/get",
         "httpMethods": "get",
         "description": "",
         "enabled": true,
@@ -1267,7 +1267,7 @@
         "id": 174219034734674,
         "parentId": 174219034718277,
         "label": "新增组织架构",
-        "path": "/api/admin/organization/add",
+        "path": "/api/admin/org/add",
         "httpMethods": "post",
         "description": "",
         "enabled": true,
@@ -1277,7 +1277,7 @@
         "id": 174219034738757,
         "parentId": 174219034718277,
         "label": "修改组织架构",
-        "path": "/api/admin/organization/update",
+        "path": "/api/admin/org/update",
         "httpMethods": "put",
         "description": "",
         "enabled": true,
@@ -1287,7 +1287,7 @@
         "id": 174219034738758,
         "parentId": 174219034718277,
         "label": "删除组织架构",
-        "path": "/api/admin/organization/softdelete",
+        "path": "/api/admin/org/softdelete",
         "httpMethods": "delete",
         "description": "",
         "enabled": true,
@@ -1297,7 +1297,7 @@
         "id": 188049296683077,
         "parentId": 174219034718277,
         "label": "查询组织架构列表",
-        "path": "/api/admin/organization/getlist",
+        "path": "/api/admin/org/getlist",
         "httpMethods": "get",
         "description": "",
         "enabled": true,

src/hosts/ZhonTai.Host/InitData/Admin/ad_employee_organization.json

@@ -1,12 +0,0 @@
-[
-  {
-    "id": 336652181319749,
-    "employeeId": 161223411986501,
-    "organizationId": 189097691009093
-  },
-  {
-    "id": 336652219781190,
-    "employeeId": 162605614280773,
-    "organizationId": 189097750675525
-  }
-]

src/hosts/ZhonTai.Host/InitData/Admin/ad_permission.json

@@ -782,7 +782,7 @@
             "label": "部门管理",
             "type": 2,
             "viewId": 174312361087045,
-            "path": "/admin/organization",
+            "path": "/admin/org",
             "icon": "",
             "enabled": true,
             "closable": true,
@@ -795,7 +795,7 @@
                 "id": 188054258278469,
                 "parentId": 188053882503237,
                 "label": "查询",
-                "code": "api:admin:organization:getlist",
+                "code": "api:admin:org:getlist",
                 "type": 3,
                 "enabled": true,
                 "sort": 0,
@@ -806,7 +806,7 @@
                 "id": 188054341582917,
                 "parentId": 188053882503237,
                 "label": "新增",
-                "code": "api:admin:organization:add",
+                "code": "api:admin:org:add",
                 "type": 3,
                 "enabled": true,
                 "sort": 0,
@@ -817,7 +817,7 @@
                 "id": 188054416891973,
                 "parentId": 188053882503237,
                 "label": "修改",
-                "code": "api:admin:organization:update",
+                "code": "api:admin:org:update",
                 "type": 3,
                 "enabled": true,
                 "sort": 0,
@@ -828,7 +828,7 @@
                 "id": 188054509027397,
                 "parentId": 188053882503237,
                 "label": "删除",
-                "code": "api:admin:organization:softdelete",
+                "code": "api:admin:org:softdelete",
                 "type": 3,
                 "enabled": true,
                 "sort": 0,

src/hosts/ZhonTai.Host/InitData/Admin/ad_staff_org.json

@@ -0,0 +1,12 @@
+[
+  {
+    "id": 336652181319749,
+    "staffId": 161223411986501,
+    "orgId": 189097691009093
+  },
+  {
+    "id": 336652219781190,
+    "staffId": 162605614280773,
+    "orgId": 189097750675525
+  }
+]

src/hosts/ZhonTai.Host/InitData/Admin/ad_view.json

@@ -137,9 +137,9 @@
           {
             "id": 174312361087045,
             "parentId": 161227168436294,
-            "name": "Organization",
+            "name": "Org",
             "label": "部门管理",
-            "path": "admin/organization",
+            "path": "admin/org",
             "description": "",
             "enabled": true,
             "cache": true
@@ -187,9 +187,9 @@
       {
         "id": 336556164280389,
         "parentId": 161227168313413,
-        "name": "Employee",
+        "name": "Staff",
         "label": "员工管理",
-        "path": "admin/employee",
+        "path": "admin/staff",
         "description": "",
         "enabled": true,
         "cache": true,

src/platform/ZhonTai.Admin/Domain/Employee/IEmployeeRepository.cs

@@ -1,7 +0,0 @@
-using ZhonTai.Admin.Core.Repositories;
-
-namespace ZhonTai.Admin.Domain.Employee;
-
-public interface IEmployeeRepository : IRepositoryBase<EmployeeEntity>
-{
-}

src/platform/ZhonTai.Admin/Domain/Employee/Output/EmployeeGetOutput.cs

@@ -1,17 +0,0 @@
-
-using ZhonTai.Admin.Domain.Employee.Input;
-
-namespace ZhonTai.Admin.Domain.Employee.Output;
-
-public class EmployeeGetOutput : EmployeeUpdateInput
-{
-    /// <summary>
-    /// 主属部门
-    /// </summary>
-    public string OrganizationName { get; set; }
-
-    /// <summary>
-    /// 附属部门
-    /// </summary>
-    public string[] OrganizationNames { get; set; }
-}

src/platform/ZhonTai.Admin/Domain/EmployeeOrganization/EmployeeOrganizationEntity.cs

@@ -1,34 +0,0 @@
-using ZhonTai.Admin.Core.Entities;
-using FreeSql.DataAnnotations;
-using ZhonTai.Admin.Domain.Employee;
-using ZhonTai.Admin.Domain.Organization;
-
-namespace ZhonTai.Admin.Domain;
-
-/// <summary>
-/// 员工所属部门
-/// </summary>
-[Table(Name = "ad_employee_organization")]
-[Index("idx_{tablename}_01", nameof(EmployeeId) + "," + nameof(OrganizationId), true)]
-public partial class EmployeeOrganizationEntity : EntityAdd
-{
-    /// <summary>
-    /// 员工Id
-    /// </summary>
-	public long EmployeeId { get; set; }
-
-    /// <summary>
-    /// 员工
-    /// </summary>
-    public EmployeeEntity Employee { get; set; }
-
-    /// <summary>
-    /// 部门Id
-    /// </summary>
-	public long OrganizationId { get; set; }
-
-    /// <summary>
-    /// 部门
-    /// </summary>
-    public OrganizationEntity Organization { get; set; }
-}

src/platform/ZhonTai.Admin/Domain/Org/IOrgRepository.cs

@@ -0,0 +1,7 @@
+using ZhonTai.Admin.Core.Repositories;
+
+namespace ZhonTai.Admin.Domain.Org;
+
+public partial interface IOrgRepository : IRepositoryBase<OrgEntity>
+{
+}

src/platform/ZhonTai.Admin/Domain/Organization/OrganizationEntity.cs → src/platform/ZhonTai.Admin/Domain/Org/OrgEntity.cs

@@ -1,16 +1,16 @@
 using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using System.Collections.Generic;
-using ZhonTai.Admin.Domain.Employee;
+using ZhonTai.Admin.Domain.Staff;
 
-namespace ZhonTai.Admin.Domain.Organization;
+namespace ZhonTai.Admin.Domain.Org;
 
 /// <summary>
 /// 组织架构
 /// </summary>
-[Table(Name = "ad_organization")]
+[Table(Name = "ad_org")]
 [Index("idx_{tablename}_01", nameof(ParentId) + "," + nameof(Name) + "," + nameof(TenantId), true)]
-public partial class OrganizationEntity : EntityFull, ITenant
+public partial class OrgEntity : EntityFull, ITenant
 {
     /// <summary>
     /// 租户Id
@@ -62,9 +62,9 @@ public partial class OrganizationEntity : EntityFull, ITenant
     /// </summary>
 	public int Sort { get; set; }
 
-    [Navigate(ManyToMany = typeof(EmployeeOrganizationEntity))]
-    public ICollection<EmployeeEntity> Employees { get; set; }
+    [Navigate(ManyToMany = typeof(StaffOrgEntity))]
+    public ICollection<StaffEntity> Staffs { get; set; }
 
     [Navigate(nameof(ParentId))]
-    public List<OrganizationEntity> Childs { get; set; }
+    public List<OrgEntity> Childs { get; set; }
 }

src/platform/ZhonTai.Admin/Domain/Organization/IOrganizationRepository.cs

@@ -1,7 +0,0 @@
-using ZhonTai.Admin.Core.Repositories;
-
-namespace ZhonTai.Admin.Domain.Organization;
-
-public partial interface IOrganizationRepository : IRepositoryBase<OrganizationEntity>
-{
-}

src/platform/ZhonTai.Admin/Domain/Role/RoleEntity.cs

@@ -6,7 +6,7 @@ using ZhonTai.Admin.Domain.Permission;
 using ZhonTai.Admin.Domain.User;
 using ZhonTai.Admin.Domain.UserRole;
 using ZhonTai.Admin.Domain.RolePermission;
-using ZhonTai.Admin.Domain.Organization;
+using ZhonTai.Admin.Domain.Org;
 
 namespace ZhonTai.Admin.Domain.Role;
 
@@ -29,7 +29,7 @@ public partial class RoleEntity : EntityFull, ITenant
     public long ParentId { get; set; }
 
     [Navigate(nameof(ParentId))]
-    public List<OrganizationEntity> Childs { get; set; }
+    public List<OrgEntity> Childs { get; set; }
 
     /// <summary>
     /// 名称

src/platform/ZhonTai.Admin/Domain/Staff/IStaffRepository.cs

@@ -0,0 +1,7 @@
+using ZhonTai.Admin.Core.Repositories;
+
+namespace ZhonTai.Admin.Domain.Staff;
+
+public interface IStaffRepository : IRepositoryBase<StaffEntity>
+{
+}

src/platform/ZhonTai.Admin/Domain/Employee/Input/EmployeeAddInput.cs → src/platform/ZhonTai.Admin/Domain/Staff/Input/StaffAddInput.cs

@@ -1,14 +1,14 @@
 using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;
-using ZhonTai.Admin.Domain.Organization;
+using ZhonTai.Admin.Domain.Org;
 
-namespace ZhonTai.Admin.Domain.Employee.Input;
+namespace ZhonTai.Admin.Domain.Staff.Input;
 
 /// <summary>
 /// 添加
 /// </summary>
-public class EmployeeAddInput
+public class StaffAddInput
 {
     /// <summary>
     /// 工号
@@ -30,7 +30,7 @@ public class EmployeeAddInput
     /// </summary>
     public long[] OrgIds { get; set; }
 
-    public ICollection<OrganizationEntity> Orgs { get; set; }
+    public ICollection<OrgEntity> Orgs { get; set; }
 
     /// <summary>
     /// 职位

src/platform/ZhonTai.Admin/Domain/Employee/Input/EmployeeUpdateInput.cs → src/platform/ZhonTai.Admin/Domain/Staff/Input/StaffUpdateInput.cs

@@ -1,10 +1,10 @@
 
-namespace ZhonTai.Admin.Domain.Employee.Input;
+namespace ZhonTai.Admin.Domain.Staff.Input;
 
 /// <summary>
 /// 修改
 /// </summary>
-public class EmployeeUpdateInput: EmployeeAddInput
+public class StaffUpdateInput: StaffAddInput
 {
     /// <summary>
     /// 编号

src/platform/ZhonTai.Admin/Domain/Staff/Output/StaffGetOutput.cs

@@ -0,0 +1,17 @@
+
+using ZhonTai.Admin.Domain.Staff.Input;
+
+namespace ZhonTai.Admin.Domain.Staff.Output;
+
+public class StaffGetOutput : StaffUpdateInput
+{
+    /// <summary>
+    /// 主属部门
+    /// </summary>
+    public string OrgName { get; set; }
+
+    /// <summary>
+    /// 附属部门
+    /// </summary>
+    public string[] OrgNames { get; set; }
+}

src/platform/ZhonTai.Admin/Domain/Employee/Output/EmployeeListOutput.cs → src/platform/ZhonTai.Admin/Domain/Staff/Output/StaffListOutput.cs

@@ -1,8 +1,8 @@
 using System;
 
-namespace ZhonTai.Admin.Domain.Employee.Output;
+namespace ZhonTai.Admin.Domain.Staff.Output;
 
-public class EmployeeListOutput
+public class StaffListOutput
 {
     /// <summary>
     /// 主键Id
@@ -32,12 +32,12 @@ public class EmployeeListOutput
     /// <summary>
     /// 主属部门
     /// </summary>
-    public string OrganizationName { get; set; }
+    public string OrgName { get; set; }
 
     /// <summary>
     /// 附属部门
     /// </summary>
-    public string[] OrganizationNames { get; set; }
+    public string[] OrgNames { get; set; }
 
     /// <summary>
     /// 职位

src/platform/ZhonTai.Admin/Domain/Employee/SexEnum.cs → src/platform/ZhonTai.Admin/Domain/Staff/SexEnum.cs

@@ -1,4 +1,4 @@
-namespace ZhonTai.Admin.Domain.Employee;
+namespace ZhonTai.Admin.Domain.Staff;
 
 /// <summary>
 /// 性别

src/platform/ZhonTai.Admin/Domain/Employee/EmployeeEntity.cs → src/platform/ZhonTai.Admin/Domain/Staff/StaffEntity.cs

@@ -2,16 +2,16 @@
 using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;
-using ZhonTai.Admin.Domain.Organization;
+using ZhonTai.Admin.Domain.Org;
 using ZhonTai.Admin.Domain.User;
 
-namespace ZhonTai.Admin.Domain.Employee;
+namespace ZhonTai.Admin.Domain.Staff;
 
 /// <summary>
 /// 员工
 /// </summary>
-[Table(Name = "ad_employee")]
-public partial class EmployeeEntity : EntityFull, ITenant
+[Table(Name = "ad_staff")]
+public partial class StaffEntity : EntityFull, ITenant
 {
     /// <summary>
     /// 租户Id
@@ -19,24 +19,12 @@ public partial class EmployeeEntity : EntityFull, ITenant
     [Column(Position = -10)]
     public long? TenantId { get; set; }
 
-    /// <summary>
-    /// 工号
-    /// </summary>
-    [Column(StringLength = 20)]
-    public string JobNumber { get; set; }
-
-    /// <summary>
-    /// 性别
-    /// </summary>
-    [Column(MapType = typeof(int))]
-    public SexEnum? Sex { get; set; }
-
     /// <summary>
     /// 主属部门Id
     /// </summary>
     public long MainOrgId { get; set; }
 
-    public OrganizationEntity MainOrg { get; set; }
+    public OrgEntity MainOrg { get; set; }
 
     /// <summary>
     /// 直属主管Id
@@ -50,11 +38,23 @@ public partial class EmployeeEntity : EntityFull, ITenant
     /// </summary>
     public string Position { get; set; }
 
+    /// <summary>
+    /// 工号
+    /// </summary>
+    [Column(StringLength = 20)]
+    public string JobNumber { get; set; }
+
+    /// <summary>
+    /// 性别
+    /// </summary>
+    [Column(MapType = typeof(int))]
+    public SexEnum? Sex { get; set; }
+
     /// <summary>
     /// 入职时间
     /// </summary>
     public DateTime? EntryTime { get; set; }
 
-    [Navigate(ManyToMany = typeof(EmployeeOrganizationEntity))]
-    public ICollection<OrganizationEntity> Orgs { get; set; }
+    [Navigate(ManyToMany = typeof(StaffOrgEntity))]
+    public ICollection<OrgEntity> Orgs { get; set; }
 }

src/platform/ZhonTai.Admin/Domain/StaffOrg/StaffOrgEntity.cs

@@ -0,0 +1,34 @@
+using ZhonTai.Admin.Core.Entities;
+using FreeSql.DataAnnotations;
+using ZhonTai.Admin.Domain.Staff;
+using ZhonTai.Admin.Domain.Org;
+
+namespace ZhonTai.Admin.Domain;
+
+/// <summary>
+/// 员工所属部门
+/// </summary>
+[Table(Name = "ad_staff_org")]
+[Index("idx_{tablename}_01", nameof(StaffId) + "," + nameof(OrgId), true)]
+public partial class StaffOrgEntity : EntityAdd
+{
+    /// <summary>
+    /// 员工Id
+    /// </summary>
+	public long StaffId { get; set; }
+
+    /// <summary>
+    /// 员工
+    /// </summary>
+    public StaffEntity Staff { get; set; }
+
+    /// <summary>
+    /// 部门Id
+    /// </summary>
+	public long OrgId { get; set; }
+
+    /// <summary>
+    /// 部门
+    /// </summary>
+    public OrgEntity Org { get; set; }
+}

src/platform/ZhonTai.Admin/Domain/User/UserEntity.cs

@@ -5,7 +5,7 @@ using ZhonTai.Admin.Core.Entities;
 using ZhonTai.Admin.Domain.Tenant;
 using ZhonTai.Admin.Domain.Role;
 using ZhonTai.Admin.Domain.UserRole;
-using ZhonTai.Admin.Domain.Employee;
+using ZhonTai.Admin.Domain.Staff;
 
 namespace ZhonTai.Admin.Domain.User;
 
@@ -82,5 +82,5 @@ public partial class UserEntity : EntityFull, ITenant
     /// 员工
     /// </summary>
     [Navigate(nameof(Id))]
-    public EmployeeEntity Emp { get; set; }
+    public StaffEntity Emp { get; set; }
 }

src/platform/ZhonTai.Admin/Domain/User/UserStatusEnum.cs

@@ -15,11 +15,6 @@ public enum UserStatusEnum
     /// </summary>
     Disabled = 1,
 
-    /// <summary>
-    /// 锁定
-    /// </summary>
-    Locked = 2,
-
     /// <summary>
     /// 待修改密码
     /// </summary>

src/platform/ZhonTai.Admin/HttpApi/AreaController.cs

@@ -1,13 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using ZhonTai.Admin.Core;
-using ZhonTai.Admin.Core.Consts;
-
-namespace ZhonTai.Admin.HttpApi;
-
-/// <summary>
-/// 域控制器
-/// </summary>
-[Area(AdminConsts.AreaName)]
-public abstract class AreaController : BaseController
-{
-}

src/platform/ZhonTai.Admin/HttpApi/Controllers/EmployeeController.cs

@@ -1,88 +0,0 @@
-using ZhonTai.Admin.Core.Dto;
-using ZhonTai.Admin.Services.Employee;
-using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
-using ZhonTai.Admin.Domain.Employee.Input;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-
-namespace ZhonTai.Admin.HttpApi.Controllers;
-
-/// <summary>
-/// 员工管理
-/// </summary>
-public class EmployeeController : AreaController
-{
-    private readonly IEmployeeService _employeeService;
-
-    public EmployeeController(IEmployeeService employeeService)
-    {
-        _employeeService = employeeService;
-    }
-
-    /// <summary>
-    /// 查询员工
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [HttpGet]
-    public async Task<IResultOutput> Get([BindRequired] long id)
-    {
-        return await _employeeService.GetAsync(id);
-    }
-
-    /// <summary>
-    /// 查询员工列表
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpPost]
-    //[ResponseCache(Duration = 60)]
-    public async Task<IResultOutput> GetPage(PageInput input)
-    {
-        return await _employeeService.GetPageAsync(input);
-    }
-
-    /// <summary>
-    /// 新增员工
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpPost]
-    public async Task<IResultOutput> Add(EmployeeAddInput input)
-    {
-        return await _employeeService.AddAsync(input);
-    }
-
-    /// <summary>
-    /// 修改员工
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpPut]
-    public async Task<IResultOutput> Update(EmployeeUpdateInput input)
-    {
-        return await _employeeService.UpdateAsync(input);
-    }
-
-    /// <summary>
-    /// 删除员工
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [HttpDelete]
-    public async Task<IResultOutput> SoftDelete(long id)
-    {
-        return await _employeeService.SoftDeleteAsync(id);
-    }
-
-    /// <summary>
-    /// 批量删除员工
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <returns></returns>
-    [HttpPut]
-    public async Task<IResultOutput> BatchSoftDelete(long[] ids)
-    {
-        return await _employeeService.BatchSoftDeleteAsync(ids);
-    }
-}

src/platform/ZhonTai.Admin/HttpApi/Controllers/OrganizationController.cs

@@ -1,75 +0,0 @@
-using ZhonTai.Admin.Core.Dto;
-using ZhonTai.Admin.Services.Organization;
-using ZhonTai.Admin.Services.Organization.Input;
-using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
-
-namespace ZhonTai.Admin.HttpApi.Controllers;
-
-/// <summary>
-/// 组织架构
-/// </summary>
-public class OrganizationController : AreaController
-{
-    private readonly IOrganizationService _organizationService;
-
-    public OrganizationController(IOrganizationService organizationService)
-    {
-        _organizationService = organizationService;
-    }
-
-    /// <summary>
-    /// 查询组织架构
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [HttpGet]
-    public async Task<IResultOutput> Get(long id)
-    {
-        return await _organizationService.GetAsync(id);
-    }
-
-    /// <summary>
-    /// 查询组织架构列表
-    /// </summary>
-    /// <param name="key"></param>
-    /// <returns></returns>
-    [HttpGet]
-    public async Task<IResultOutput> GetList(string key)
-    {
-        return await _organizationService.GetListAsync(key);
-    }
-
-    /// <summary>
-    /// 新增组织架构
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpPost]
-    public async Task<IResultOutput> Add(OrganizationAddInput input)
-    {
-        return await _organizationService.AddAsync(input);
-    }
-
-    /// <summary>
-    /// 修改组织架构
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpPut]
-    public async Task<IResultOutput> Update(OrganizationUpdateInput input)
-    {
-        return await _organizationService.UpdateAsync(input);
-    }
-
-    /// <summary>
-    /// 删除组织架构
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [HttpDelete]
-    public async Task<IResultOutput> SoftDelete(long id)
-    {
-        return await _organizationService.SoftDeleteAsync(id);
-    }
-}

src/platform/ZhonTai.Admin/Repositories/CustomGenerateData.cs

@@ -16,8 +16,8 @@ using ZhonTai.Admin.Domain.PermissionApi;
 using ZhonTai.Admin.Domain.View;
 using ZhonTai.Admin.Core.Configs;
 using ZhonTai.Common.Extensions;
-using ZhonTai.Admin.Domain.Employee;
-using ZhonTai.Admin.Domain.Organization;
+using ZhonTai.Admin.Domain.Staff;
+using ZhonTai.Admin.Domain.Org;
 using ZhonTai.Admin.Core.Db.Data;
 using FreeSql;
 using ZhonTai.Admin.Domain;
@@ -157,7 +157,7 @@ public class CustomGenerateData : GenerateData, IGenerateData
 
         #region 员工
 
-        var employees = db.Queryable<EmployeeEntity>().ToListIgnore(a => new
+        var staffs = db.Queryable<StaffEntity>().ToListIgnore(a => new
         {
             a.CreatedTime,
             a.CreatedUserId,
@@ -172,7 +172,7 @@ public class CustomGenerateData : GenerateData, IGenerateData
 
         #region 部门
 
-        var organizations = db.Queryable<OrganizationEntity>().ToListIgnore(a => new
+        var orgs = db.Queryable<OrgEntity>().ToListIgnore(a => new
         {
             a.CreatedTime,
             a.CreatedUserId,
@@ -182,7 +182,7 @@ public class CustomGenerateData : GenerateData, IGenerateData
             a.ModifiedUserName,
             a.Version
         });
-        var organizationTree = organizations.Clone().ToTree((r, c) =>
+        var orgTree = orgs.Clone().ToTree((r, c) =>
         {
             return c.ParentId == 0;
         },
@@ -192,7 +192,7 @@ public class CustomGenerateData : GenerateData, IGenerateData
         },
         (r, datalist) =>
         {
-            r.Childs ??= new List<OrganizationEntity>();
+            r.Childs ??= new List<OrgEntity>();
             r.Childs.AddRange(datalist);
         });
 
@@ -226,11 +226,11 @@ public class CustomGenerateData : GenerateData, IGenerateData
 
         #region 用户部门
 
-        var userOrgs = await db.Queryable<EmployeeOrganizationEntity>().ToListAsync(a => new
+        var userOrgs = await db.Queryable<StaffOrgEntity>().ToListAsync(a => new
         {
             a.Id,
-            a.EmployeeId,
-            a.OrganizationId
+            a.StaffId,
+            a.OrgId
         });
 
         #endregion
@@ -295,8 +295,8 @@ public class CustomGenerateData : GenerateData, IGenerateData
         SaveDataToJsonFile<DictionaryTypeEntity>(dictionaryTypes, isTenant);
         SaveDataToJsonFile<UserEntity>(users, isTenant);
         SaveDataToJsonFile<RoleEntity>(roles, isTenant);
-        SaveDataToJsonFile<OrganizationEntity>(organizationTree, isTenant);
-        SaveDataToJsonFile<EmployeeEntity>(employees, isTenant);
+        SaveDataToJsonFile<OrgEntity>(orgTree, isTenant);
+        SaveDataToJsonFile<StaffEntity>(staffs, isTenant);
         if (isTenant)
         {
             var tenantIds = tenants?.Select(a => a.Id)?.ToList();
@@ -304,7 +304,7 @@ public class CustomGenerateData : GenerateData, IGenerateData
             SaveDataToJsonFile<DictionaryTypeEntity>(dictionaryTypes.Where(a => tenantIds.Contains(a.TenantId.Value)));
             SaveDataToJsonFile<UserEntity>(users.Where(a => tenantIds.Contains(a.TenantId.Value)), false);
             SaveDataToJsonFile<RoleEntity>(roles.Where(a => tenantIds.Contains(a.TenantId.Value)));
-            organizationTree = organizations.Clone().Where(a => tenantIds.Contains(a.TenantId.Value)).ToList().ToTree((r, c) =>
+            orgTree = orgs.Clone().Where(a => tenantIds.Contains(a.TenantId.Value)).ToList().ToTree((r, c) =>
             {
                 return c.ParentId == 0;
             },
@@ -314,14 +314,14 @@ public class CustomGenerateData : GenerateData, IGenerateData
             },
             (r, datalist) =>
             {
-                r.Childs ??= new List<OrganizationEntity>();
+                r.Childs ??= new List<OrgEntity>();
                 r.Childs.AddRange(datalist);
             });
-            SaveDataToJsonFile<OrganizationEntity>(organizationTree);
-            SaveDataToJsonFile<EmployeeEntity>(employees.Where(a => tenantIds.Contains(a.TenantId.Value)));
+            SaveDataToJsonFile<OrgEntity>(orgTree);
+            SaveDataToJsonFile<StaffEntity>(staffs.Where(a => tenantIds.Contains(a.TenantId.Value)));
         }
         SaveDataToJsonFile<UserRoleEntity>(userRoles);
-        SaveDataToJsonFile<EmployeeOrganizationEntity>(userOrgs);
+        SaveDataToJsonFile<StaffOrgEntity>(userOrgs);
         SaveDataToJsonFile<ApiEntity>(apiTree);
         SaveDataToJsonFile<ViewEntity>(viewTree);
         SaveDataToJsonFile<PermissionEntity>(permissionTree);

src/platform/ZhonTai.Admin/Repositories/CustomSyncData.cs

@@ -12,8 +12,8 @@ using ZhonTai.Admin.Domain.TenantPermission;
 using ZhonTai.Admin.Domain.PermissionApi;
 using ZhonTai.Admin.Domain.View;
 using ZhonTai.Admin.Core.Configs;
-using ZhonTai.Admin.Domain.Organization;
-using ZhonTai.Admin.Domain.Employee;
+using ZhonTai.Admin.Domain.Org;
+using ZhonTai.Admin.Domain.Staff;
 using ZhonTai.Admin.Core.Db.Data;
 using ZhonTai.Admin.Domain;
 
@@ -37,11 +37,11 @@ public class CustomSyncData : SyncData, ISyncData
             var users = GetData<UserEntity>(isTenant);
             await InitDataAsync(db, uow, tran, users, dbConfig);
 
-            var employees = GetData<EmployeeEntity>(isTenant);
-            await InitDataAsync(db, uow, tran, employees, dbConfig);
+            var staffs = GetData<StaffEntity>(isTenant);
+            await InitDataAsync(db, uow, tran, staffs, dbConfig);
 
-            var organizations = GetData<OrganizationEntity>(isTenant);
-            await InitDataAsync(db, uow, tran, organizations, dbConfig);
+            var orgs = GetData<OrgEntity>(isTenant);
+            await InitDataAsync(db, uow, tran, orgs, dbConfig);
 
             var roles = GetData<RoleEntity>(isTenant);
             await InitDataAsync(db, uow, tran, roles, dbConfig);
@@ -58,7 +58,7 @@ public class CustomSyncData : SyncData, ISyncData
             var userRoles = GetData<UserRoleEntity>();
             await InitDataAsync(db, uow, tran, userRoles, dbConfig);
 
-            var userOrgs = GetData<EmployeeOrganizationEntity>();
+            var userOrgs = GetData<StaffOrgEntity>();
             await InitDataAsync(db, uow, tran, userOrgs, dbConfig);
 
             var rolePermissions = GetData<RolePermissionEntity>();

src/platform/ZhonTai.Admin/Repositories/Employee/EmployeeRepository.cs

@@ -1,13 +0,0 @@
-using ZhonTai.Admin.Core.Db.Transaction;
-using ZhonTai.Admin.Core.Repositories;
-using ZhonTai.Admin.Domain.Employee;
-
-namespace ZhonTai.Admin.Repositories;
-
-public class EmployeeRepository : RepositoryCloud<EmployeeEntity>, IEmployeeRepository
-{
-    public EmployeeRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
-    {
-
-    }
-}

src/platform/ZhonTai.Admin/Repositories/Org/OrgRepository.cs

@@ -0,0 +1,12 @@
+using ZhonTai.Admin.Core.Db.Transaction;
+using ZhonTai.Admin.Core.Repositories;
+using ZhonTai.Admin.Domain.Org;
+
+namespace ZhonTai.Admin.Repositories;
+
+public class OrgRepository : RepositoryCloud<OrgEntity>, IOrgRepository
+{
+    public OrgRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
+    {
+    }
+}

src/platform/ZhonTai.Admin/Repositories/Organization/OrganizationRepository.cs

@@ -1,12 +0,0 @@
-using ZhonTai.Admin.Core.Db.Transaction;
-using ZhonTai.Admin.Core.Repositories;
-using ZhonTai.Admin.Domain.Organization;
-
-namespace ZhonTai.Admin.Repositories;
-
-public class OrganizationRepository : RepositoryCloud<OrganizationEntity>, IOrganizationRepository
-{
-    public OrganizationRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
-    {
-    }
-}

src/platform/ZhonTai.Admin/Repositories/Staff/StaffRepository.cs

@@ -0,0 +1,13 @@
+using ZhonTai.Admin.Core.Db.Transaction;
+using ZhonTai.Admin.Core.Repositories;
+using ZhonTai.Admin.Domain.Staff;
+
+namespace ZhonTai.Admin.Repositories;
+
+public class StaffRepository : RepositoryCloud<StaffEntity>, IStaffRepository
+{
+    public StaffRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
+    {
+
+    }
+}

src/platform/ZhonTai.Admin/Services/Auth/AuthService.cs

@@ -174,22 +174,13 @@ public class AuthService : BaseService, IAuthService, IDynamicApi
             var isOk = await _captchaTool.CheckAsync(input.Captcha);
             if (!isOk)
             {
-                return ResultOutput.NotOk("安全验证不通过，请重新登录！");
+                return ResultOutput.NotOk("安全验证不通过，请重新登录");
             }
         }
 
-        #endregion 验证码校验
+        #endregion
 
-        UserEntity user = null;
-
-        user = await _userRepository.Select.DisableGlobalFilter("Tenant").Where(a => a.UserName == input.UserName).ToOneAsync();
-
-        if (!(user?.Id > 0))
-        {
-            return ResultOutput.NotOk("账号输入有误!", 3);
-        }
-
-        #region 解密
+        #region 密码解密
 
         if (input.PasswordKey.NotNull())
         {
@@ -200,35 +191,49 @@ public class AuthService : BaseService, IAuthService, IDynamicApi
                 var secretKey = await Cache.GetAsync(passwordEncryptKey);
                 if (secretKey.IsNull())
                 {
-                    return ResultOutput.NotOk("解密失败！", 1);
+                    return ResultOutput.NotOk("解密失败");
                 }
                 input.Password = DesEncrypt.Decrypt(input.Password, secretKey);
                 await Cache.DelAsync(passwordEncryptKey);
             }
             else
             {
-                return ResultOutput.NotOk("解密失败！", 1);
+                return ResultOutput.NotOk("解密失败！");
             }
         }
 
-        #endregion 解密
+        #endregion
 
+        #region 登录
         var password = MD5Encrypt.Encrypt32(input.Password);
-        if (user.Password != password)
+        var user = await _userRepository.Select.DisableGlobalFilter("Tenant")
+            .Where(a => a.UserName == input.UserName && a.Password == password).ToOneAsync();
+
+        if (!(user?.Id > 0))
         {
-            return ResultOutput.NotOk("密码输入有误！", 4);
+            return ResultOutput.NotOk("用户名或密码错误");
         }
 
-        var authLoginOutput = Mapper.Map<AuthLoginOutput>(user);
+        if(user.Status== UserStatusEnum.Disabled)
+        {
+            return ResultOutput.NotOk("禁止登录，请联系管理员");
+        }
+        #endregion
 
+        #region 获得token
+        var authLoginOutput = Mapper.Map<AuthLoginOutput>(user);
         if (_appConfig.Tenant)
         {
-            var tenant = await _tenantRepository.Select.DisableGlobalFilter("Tenant").WhereDynamic(user.TenantId).ToOneAsync(a => new { a.TenantType, a.DataIsolationType });
+            var tenant = await _tenantRepository.Select.DisableGlobalFilter("Tenant").WhereDynamic(user.TenantId).ToOneAsync(a => new
+            {
+                a.TenantType,
+                a.DataIsolationType
+            });
             authLoginOutput.TenantType = tenant.TenantType;
             authLoginOutput.DataIsolationType = tenant.DataIsolationType;
         }
-
-        string token = GetToken(authLoginOutput);
+        string token = GetToken(authLoginOutput); 
+        #endregion
 
         sw.Stop();
 

src/platform/ZhonTai.Admin/Services/Employee/EmployeeService.cs

@@ -1,186 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using ZhonTai.Admin.Core.Attributes;
-using ZhonTai.Admin.Core.Dto;
-using ZhonTai.Admin.Domain;
-using ZhonTai.Admin.Domain.Employee.Input;
-using ZhonTai.Admin.Domain.Employee.Output;
-using ZhonTai.Admin.Core.Repositories;
-using ZhonTai.Admin.Domain.Employee;
-using ZhonTai.Admin.Domain.Organization;
-
-namespace ZhonTai.Admin.Services.Employee;
-
-/// <summary>
-/// 员工服务
-/// </summary>
-public class EmployeeService : BaseService, IEmployeeService
-{
-    private readonly IEmployeeRepository _employeeRepository;
-    private readonly IRepositoryBase<EmployeeOrganizationEntity> _employeeOrganizationRepository;
-
-    public EmployeeService(
-        IEmployeeRepository userRepository,
-        IRepositoryBase<EmployeeOrganizationEntity> employeeOrganizationRepository
-    )
-    {
-        _employeeRepository = userRepository;
-        _employeeOrganizationRepository = employeeOrganizationRepository;
-    }
-
-    /// <summary>
-    /// 查询员工
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public async Task<ResultOutput<EmployeeGetOutput>> GetAsync(long id)
-    {
-        var res = new ResultOutput<EmployeeGetOutput>();
-
-        var dto = await _employeeRepository.Select
-        .WhereDynamic(id)
-        .IncludeMany(a => a.Orgs.Select(b => new OrganizationEntity { Id = b.Id }))
-        .ToOneAsync(a => new EmployeeGetOutput
-        {
-            OrganizationName = a.MainOrg.Name
-        });
-
-        return res.Ok(dto);
-    }
-
-    /// <summary>
-    /// 查询分页
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    public async Task<IResultOutput> GetPageAsync(PageInput input)
-    {
-        var list = await _employeeRepository.Select
-        .WhereDynamicFilter(input.DynamicFilter)
-        .Count(out var total)
-        .OrderByDescending(true, a => a.Id)
-        .IncludeMany(a => a.Orgs.Select(b => new OrganizationEntity { Name = b.Name }))
-        .Page(input.CurrentPage, input.PageSize)
-        .ToListAsync(a => new EmployeeListOutput 
-        { 
-            OrganizationName = a.MainOrg.Name
-        });
-
-        var data = new PageOutput<EmployeeListOutput>()
-        {
-            List = list,
-            Total = total
-        };
-
-        return ResultOutput.Ok(data);
-    }
-
-    /// <summary>
-    /// 新增
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [Transaction]
-    public async Task<IResultOutput> AddAsync(EmployeeAddInput input)
-    {
-        var entity = Mapper.Map<EmployeeEntity>(input);
-        var employeeId = (await _employeeRepository.InsertAsync(entity))?.Id;
-
-        if (!(employeeId > 0))
-        {
-            return ResultOutput.NotOk();
-        }
-
-        //所属部门
-        if (input.OrgIds != null && input.OrgIds.Any())
-        {
-            var organizations = input.OrgIds.Select(organizationId => new EmployeeOrganizationEntity
-            { 
-                EmployeeId = employeeId.Value, 
-                OrganizationId = organizationId 
-            });
-            await _employeeOrganizationRepository.InsertAsync(organizations);
-        }
-
-        return ResultOutput.Ok();
-    }
-
-    /// <summary>
-    /// 修改
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [Transaction]
-    public async Task<IResultOutput> UpdateAsync(EmployeeUpdateInput input)
-    {
-        if (!(input?.Id > 0))
-        {
-            return ResultOutput.NotOk();
-        }
-
-        var employee = await _employeeRepository.GetAsync(input.Id);
-        if (!(employee?.Id > 0))
-        {
-            return ResultOutput.NotOk("用户不存在！");
-        }
-
-        Mapper.Map(input, employee);
-        await _employeeRepository.UpdateAsync(employee);
-
-        await _employeeOrganizationRepository.DeleteAsync(a => a.EmployeeId == employee.Id);
-
-        //附属部门
-        if (input.OrgIds != null && input.OrgIds.Any())
-        {
-            var organizations = input.OrgIds.Select(organizationId => new EmployeeOrganizationEntity 
-            { 
-                EmployeeId = employee.Id, 
-                OrganizationId = organizationId 
-            });
-            await _employeeOrganizationRepository.InsertAsync(organizations);
-        }
-
-        return ResultOutput.Ok();
-    }
-
-    /// <summary>
-    /// 彻底删除
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [Transaction]
-    public async Task<IResultOutput> DeleteAsync(long id)
-    {
-        //删除员工所属部门
-        await _employeeOrganizationRepository.DeleteAsync(a => a.EmployeeId == id);
-
-        //删除员工
-        await _employeeRepository.DeleteAsync(m => m.Id == id);
-
-        return ResultOutput.Ok();
-    }
-
-    /// <summary>
-    /// 删除
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public async Task<IResultOutput> SoftDeleteAsync(long id)
-    {
-        await _employeeRepository.SoftDeleteAsync(id);
-
-        return ResultOutput.Ok();
-    }
-
-    /// <summary>
-    /// 批量删除
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <returns></returns>
-    public async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
-    {
-        await _employeeRepository.SoftDeleteAsync(ids);
-
-        return ResultOutput.Ok();
-    }
-}

src/platform/ZhonTai.Admin/Services/Employee/IEmployeeService.cs

@@ -1,26 +0,0 @@
-using System.Threading.Tasks;
-using ZhonTai.Admin.Core.Dto;
-using ZhonTai.Admin.Domain.Employee.Input;
-using ZhonTai.Admin.Domain.Employee.Output;
-
-namespace ZhonTai.Admin.Services.Employee;
-
-/// <summary>
-/// 员工服务
-/// </summary>
-public interface IEmployeeService
-{
-    Task<ResultOutput<EmployeeGetOutput>> GetAsync(long id);
-
-    Task<IResultOutput> GetPageAsync(PageInput input);
-
-    Task<IResultOutput> AddAsync(EmployeeAddInput input);
-
-    Task<IResultOutput> UpdateAsync(EmployeeUpdateInput input);
-
-    Task<IResultOutput> DeleteAsync(long id);
-
-    Task<IResultOutput> SoftDeleteAsync(long id);
-
-    Task<IResultOutput> BatchSoftDeleteAsync(long[] ids);
-}

src/platform/ZhonTai.Admin/Services/Employee/_MapConfig.cs

@@ -1,23 +0,0 @@
-using ZhonTai.Admin.Domain.Employee.Output;
-using System.Linq;
-using Mapster;
-using ZhonTai.Admin.Domain.Employee;
-
-namespace ZhonTai.Admin.Services.Employee;
-
-/// <summary>
-/// 映射配置
-/// </summary>
-public class MapConfig : IRegister
-{
-    public void Register(TypeAdapterConfig config)
-    {
-        config
-        .NewConfig<EmployeeEntity, EmployeeGetOutput>()
-        .Map(dest => dest.OrgIds, src => src.Orgs.Select(a => a.Id));
-
-        config
-        .NewConfig<EmployeeEntity, EmployeeListOutput>()
-        .Map(dest => dest.OrganizationNames, src => src.Orgs.Select(a => a.Name));
-    }
-}

src/platform/ZhonTai.Admin/Services/Org/IOrgService.cs

@@ -0,0 +1,20 @@
+using ZhonTai.Admin.Core.Dto;
+using ZhonTai.Admin.Services.Org.Input;
+using System.Threading.Tasks;
+
+namespace ZhonTai.Admin.Services.Org;
+
+public partial interface IOrgService
+{
+    Task<IResultOutput> GetAsync(long id);
+
+    Task<IResultOutput> GetListAsync(string key);
+
+    Task<IResultOutput> AddAsync(OrgAddInput input);
+
+    Task<IResultOutput> UpdateAsync(OrgUpdateInput input);
+
+    Task<IResultOutput> DeleteAsync(long id);
+
+    Task<IResultOutput> SoftDeleteAsync(long id);
+}

src/platform/ZhonTai.Admin/Services/Organization/Input/OrganizationAddInput.cs → src/platform/ZhonTai.Admin/Services/Org/Input/OrgAddInput.cs

@@ -1,9 +1,9 @@
-namespace ZhonTai.Admin.Services.Organization.Input;
+namespace ZhonTai.Admin.Services.Org.Input;
 
 /// <summary>
 /// 添加
 /// </summary>
-public class OrganizationAddInput
+public class OrgAddInput
 {
     /// <summary>
     /// 父级
@@ -33,7 +33,7 @@ public class OrganizationAddInput
     /// <summary>
     /// 员工人数
     /// </summary>
-    public int EmployeeCount { get; set; }
+    public int StaffCount { get; set; }
 
     /// <summary>
     /// 描述

src/platform/ZhonTai.Admin/Services/Organization/Input/OrganizationUpdateInput.cs → src/platform/ZhonTai.Admin/Services/Org/Input/OrgUpdateInput.cs

@@ -1,9 +1,9 @@
-namespace ZhonTai.Admin.Services.Organization.Input;
+namespace ZhonTai.Admin.Services.Org.Input;
 
 /// <summary>
 /// 修改
 /// </summary>
-public class OrganizationUpdateInput : OrganizationAddInput
+public class OrgUpdateInput : OrgAddInput
 {
     /// <summary>
     /// 主键Id

src/platform/ZhonTai.Admin/Services/Organization/OrganizationService.cs → src/platform/ZhonTai.Admin/Services/Org/OrgService.cs

@@ -1,24 +1,25 @@
 using ZhonTai.Admin.Core.Dto;
-using ZhonTai.Admin.Services.Organization.Input;
-using ZhonTai.Admin.Services.Organization.Output;
+using ZhonTai.Admin.Services.Org.Input;
+using ZhonTai.Admin.Services.Org.Output;
 using System.Threading.Tasks;
-using ZhonTai.Admin.Services;
-using ZhonTai.Admin.Domain.Organization;
-using ZhonTai.DynamicApi;
+using ZhonTai.Admin.Domain.Org;
+using ZhonTai.Admin.Core.Consts;
 using ZhonTai.DynamicApi.Attributes;
+using ZhonTai.DynamicApi;
 
-namespace ZhonTai.Admin.Services.Organization;
+namespace ZhonTai.Admin.Services.Org;
 
 /// <summary>
 /// 部门服务
 /// </summary>
-public class OrganizationService : BaseService, IOrganizationService
+[DynamicApi(Area = AdminConsts.AreaName)]
+public class OrgService : BaseService, IOrgService, IDynamicApi
 {
-    private readonly IOrganizationRepository _organizationRepository;
+    private readonly IOrgRepository _orgRepository;
 
-    public OrganizationService(IOrganizationRepository organizationRepository)
+    public OrgService(IOrgRepository orgRepository)
     {
-        _organizationRepository = organizationRepository;
+        _orgRepository = orgRepository;
     }
 
     /// <summary>
@@ -28,7 +29,7 @@ public class OrganizationService : BaseService, IOrganizationService
     /// <returns></returns>
     public async Task<IResultOutput> GetAsync(long id)
     {
-        var result = await _organizationRepository.GetAsync<OrganizationGetOutput>(id);
+        var result = await _orgRepository.GetAsync<OrgGetOutput>(id);
         return ResultOutput.Ok(result);
     }
 
@@ -39,11 +40,11 @@ public class OrganizationService : BaseService, IOrganizationService
     /// <returns></returns>
     public async Task<IResultOutput> GetListAsync(string key)
     {
-        var data = await _organizationRepository
+        var data = await _orgRepository
             .WhereIf(key.NotNull(), a => a.Name.Contains(key) || a.Code.Contains(key))
             .OrderBy(a => a.ParentId)
             .OrderBy(a => a.Sort)
-            .ToListAsync<OrganizationListOutput>();
+            .ToListAsync<OrgListOutput>();
 
         return ResultOutput.Ok(data);
     }
@@ -53,10 +54,10 @@ public class OrganizationService : BaseService, IOrganizationService
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    public async Task<IResultOutput> AddAsync(OrganizationAddInput input)
+    public async Task<IResultOutput> AddAsync(OrgAddInput input)
     {
-        var dictionary = Mapper.Map<OrganizationEntity>(input);
-        var id = (await _organizationRepository.InsertAsync(dictionary)).Id;
+        var dictionary = Mapper.Map<OrgEntity>(input);
+        var id = (await _orgRepository.InsertAsync(dictionary)).Id;
         return ResultOutput.Result(id > 0);
     }
 
@@ -65,21 +66,21 @@ public class OrganizationService : BaseService, IOrganizationService
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    public async Task<IResultOutput> UpdateAsync(OrganizationUpdateInput input)
+    public async Task<IResultOutput> UpdateAsync(OrgUpdateInput input)
     {
         if (!(input?.Id > 0))
         {
             return ResultOutput.NotOk();
         }
 
-        var entity = await _organizationRepository.GetAsync(input.Id);
+        var entity = await _orgRepository.GetAsync(input.Id);
         if (!(entity?.Id > 0))
         {
             return ResultOutput.NotOk("数据字典不存在！");
         }
 
         Mapper.Map(input, entity);
-        await _organizationRepository.UpdateAsync(entity);
+        await _orgRepository.UpdateAsync(entity);
         return ResultOutput.Ok();
     }
 
@@ -90,7 +91,7 @@ public class OrganizationService : BaseService, IOrganizationService
     /// <returns></returns>
     public async Task<IResultOutput> DeleteAsync(long id)
     {
-        var result = await _organizationRepository.DeleteRecursiveAsync(a => a.Id == id);
+        var result = await _orgRepository.DeleteRecursiveAsync(a => a.Id == id);
 
         return ResultOutput.Result(result);
     }
@@ -102,7 +103,7 @@ public class OrganizationService : BaseService, IOrganizationService
     /// <returns></returns>
     public async Task<IResultOutput> SoftDeleteAsync(long id)
     {
-        var result = await _organizationRepository.SoftDeleteRecursiveAsync(a => a.Id == id);
+        var result = await _orgRepository.SoftDeleteRecursiveAsync(a => a.Id == id);
 
         return ResultOutput.Result(result);
     }

src/platform/ZhonTai.Admin/Services/Org/Output/OrgGetOutput.cs

@@ -0,0 +1,7 @@
+using ZhonTai.Admin.Services.Org.Input;
+
+namespace ZhonTai.Admin.Services.Org.Output;
+
+public class OrgGetOutput : OrgUpdateInput
+{
+}

src/platform/ZhonTai.Admin/Services/Organization/Output/OrganizationListOutput.cs → src/platform/ZhonTai.Admin/Services/Org/Output/OrgListOutput.cs

@@ -1,8 +1,8 @@
 using System;
 
-namespace ZhonTai.Admin.Services.Organization.Output;
+namespace ZhonTai.Admin.Services.Org.Output;
 
-public class OrganizationListOutput
+public class OrgListOutput
 {
     /// <summary>
     /// 主键Id

src/platform/ZhonTai.Admin/Services/Organization/IOrganizationService.cs

@@ -1,20 +0,0 @@
-using ZhonTai.Admin.Core.Dto;
-using ZhonTai.Admin.Services.Organization.Input;
-using System.Threading.Tasks;
-
-namespace ZhonTai.Admin.Services.Organization;
-
-public partial interface IOrganizationService
-{
-    Task<IResultOutput> GetAsync(long id);
-
-    Task<IResultOutput> GetListAsync(string key);
-
-    Task<IResultOutput> AddAsync(OrganizationAddInput input);
-
-    Task<IResultOutput> UpdateAsync(OrganizationUpdateInput input);
-
-    Task<IResultOutput> DeleteAsync(long id);
-
-    Task<IResultOutput> SoftDeleteAsync(long id);
-}

src/platform/ZhonTai.Admin/Services/Organization/Output/OrganizationGetOutput.cs

@@ -1,7 +0,0 @@
-using ZhonTai.Admin.Services.Organization.Input;
-
-namespace ZhonTai.Admin.Services.Organization.Output;
-
-public class OrganizationGetOutput : OrganizationUpdateInput
-{
-}

src/platform/ZhonTai.Admin/Services/Tenant/TenantService.cs

@@ -16,8 +16,8 @@ using ZhonTai.DynamicApi;
 using ZhonTai.DynamicApi.Attributes;
 using ZhonTai.Admin.Core.Consts;
 using ZhonTai.Admin.Core.Configs;
-using ZhonTai.Admin.Domain.Organization;
-using ZhonTai.Admin.Domain.Employee;
+using ZhonTai.Admin.Domain.Org;
+using ZhonTai.Admin.Domain.Staff;
 using ZhonTai.Admin.Domain;
 
 namespace ZhonTai.Admin.Services.Tenant;
@@ -33,9 +33,9 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
     private readonly IUserRepository _userRepository;
     private readonly IRepositoryBase<UserRoleEntity> _userRoleRepository;
     private readonly IRepositoryBase<RolePermissionEntity> _rolePermissionRepository;
-    private IOrganizationRepository _organizationRepository => LazyGetRequiredService<IOrganizationRepository>();
-    private IEmployeeRepository _employeeRepository => LazyGetRequiredService<IEmployeeRepository>();
-    private IRepositoryBase<EmployeeOrganizationEntity> _empOrgRepository => LazyGetRequiredService<IRepositoryBase<EmployeeOrganizationEntity>>();
+    private IOrgRepository _orgRepository => LazyGetRequiredService<IOrgRepository>();
+    private IStaffRepository _staffRepository => LazyGetRequiredService<IStaffRepository>();
+    private IRepositoryBase<StaffOrgEntity> _empOrgRepository => LazyGetRequiredService<IRepositoryBase<StaffOrgEntity>>();
 
     private AppConfig _appConfig => LazyGetRequiredService<AppConfig>();
 
@@ -106,7 +106,7 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
         var tenantId = tenant.Id;
 
         //添加部门
-        var org = new OrganizationEntity
+        var org = new OrgEntity
         {
             TenantId = tenantId,
             Name = input.Name,
@@ -114,7 +114,7 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
             ParentId = 0,
             MemberCount = 1
         };
-        await _organizationRepository.InsertAsync(org);
+        await _orgRepository.InsertAsync(org);
 
         //添加主管理员
         var pwd = MD5Encrypt.Encrypt32(_appConfig.DefaultPassword);
@@ -130,19 +130,19 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
         await _userRepository.InsertAsync(user);
 
         //添加员工
-        var emp = new EmployeeEntity
+        var emp = new StaffEntity
         {
             Id = user.Id,
             TenantId = tenantId,
             MainOrgId = org.Id
         };
-        await _employeeRepository.InsertAsync(emp);
+        await _staffRepository.InsertAsync(emp);
 
         //添加用户部门
-        var userOrg = new EmployeeOrganizationEntity
+        var userOrg = new StaffOrgEntity
         {
-            EmployeeId = user.Id,
-            OrganizationId = org.Id
+            StaffId = user.Id,
+            OrgId = org.Id
         };
         await _empOrgRepository.InsertAsync(userOrg);
 

src/platform/ZhonTai.Admin/Services/User/Dto/EmployeeAddInput.cs → src/platform/ZhonTai.Admin/Services/User/Dto/StaffAddInput.cs

@@ -1,12 +1,12 @@
 using System.Collections.Generic;
-using ZhonTai.Admin.Domain.Organization;
+using ZhonTai.Admin.Domain.Org;
 
 namespace ZhonTai.Admin.Domain.User;
 
 /// <summary>
 /// 员工添加
 /// </summary>
-public class EmployeeAddInput
+public class StaffAddInput
 {
     /// <summary>
     /// 主属部门Id
@@ -18,5 +18,5 @@ public class EmployeeAddInput
     /// </summary>
     public long[] OrgIds { get; set; }
 
-    public ICollection<OrganizationEntity> Orgs { get; set; }
+    public ICollection<OrgEntity> Orgs { get; set; }
 }

src/platform/ZhonTai.Admin/Services/User/Dto/EmployeeUpdateInput.cs → src/platform/ZhonTai.Admin/Services/User/Dto/StaffUpdateInput.cs

@@ -4,7 +4,7 @@ namespace ZhonTai.Admin.Domain.User;
 /// <summary>
 /// 修改
 /// </summary>
-public class EmployeeUpdateInput: EmployeeAddInput
+public class StaffUpdateInput: StaffAddInput
 {
     /// <summary>
     /// 编号

src/platform/ZhonTai.Admin/Services/User/Dto/UserAddInput.cs

@@ -49,5 +49,5 @@ public class UserAddInput
     /// <summary>
     /// 员工
     /// </summary>
-    public EmployeeAddInput Emp { get; set; }
+    public StaffAddInput Emp { get; set; }
 }

src/platform/ZhonTai.Admin/Services/User/Dto/UserUpdateInput.cs

@@ -55,7 +55,7 @@ public partial class UserUpdateInput
     /// <summary>
     /// 员工信息
     /// </summary>
-    public EmployeeUpdateInput Emp { get; set; }
+    public StaffUpdateInput Emp { get; set; }
 
     /// <summary>
     /// 版本

src/platform/ZhonTai.Admin/Services/User/UserService.cs

@@ -22,9 +22,9 @@ using ZhonTai.DynamicApi;
 using ZhonTai.DynamicApi.Attributes;
 using ZhonTai.Admin.Core.Helpers;
 using ZhonTai.Admin.Core.Consts;
-using ZhonTai.Admin.Domain.Employee;
+using ZhonTai.Admin.Domain.Staff;
 using ZhonTai.Admin.Domain;
-using ZhonTai.Admin.Domain.Organization;
+using ZhonTai.Admin.Domain.Org;
 using System.Data;
 
 namespace ZhonTai.Admin.Services.User;
@@ -40,8 +40,8 @@ public class UserService : BaseService, IUserService, IDynamicApi
     private IRepositoryBase<UserRoleEntity> _userRoleRepository => LazyGetRequiredService<IRepositoryBase<UserRoleEntity>>();
     private ITenantRepository _tenantRepository => LazyGetRequiredService<ITenantRepository>();
     private IApiRepository _apiRepository => LazyGetRequiredService<IApiRepository>();
-    private IEmployeeRepository _employeeRepository => LazyGetRequiredService<IEmployeeRepository>();
-    private IRepositoryBase<EmployeeOrganizationEntity> _employeeOrganizationRepository => LazyGetRequiredService<IRepositoryBase<EmployeeOrganizationEntity>>();
+    private IStaffRepository _staffRepository => LazyGetRequiredService<IStaffRepository>();
+    private IRepositoryBase<StaffOrgEntity> _staffOrgRepository => LazyGetRequiredService<IRepositoryBase<StaffOrgEntity>>();
 
     public UserService()
     {
@@ -57,7 +57,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
         var output = await _userRepository.Select
         .WhereDynamic(id)
         .IncludeMany(a => a.Roles.Select(b => new RoleEntity { Id = b.Id, Name = b.Name }))
-        .IncludeMany(a => a.Emp.Orgs.Select(b => new OrganizationEntity { Id = b.Id, Name = b.Name }))
+        .IncludeMany(a => a.Emp.Orgs.Select(b => new OrgEntity { Id = b.Id, Name = b.Name }))
         .ToOneAsync(a=>new
         {
             a.Id,
@@ -206,19 +206,19 @@ public class UserService : BaseService, IUserService, IDynamicApi
         }
 
         // 员工信息
-        var emp = Mapper.Map<EmployeeEntity>(input.Emp);
+        var emp = Mapper.Map<StaffEntity>(input.Emp);
         emp.Id = user.Id;
-        await _employeeRepository.InsertAsync(emp);
+        await _staffRepository.InsertAsync(emp);
 
         //所属部门
         if (input.Emp.OrgIds != null && input.Emp.OrgIds.Any())
         {
-            var organizations = input.Emp.OrgIds.Select(organizationId => new EmployeeOrganizationEntity
+            var orgs = input.Emp.OrgIds.Select(orgId => new StaffOrgEntity
             {
-                EmployeeId = emp.Id,
-                OrganizationId = organizationId
+                StaffId = emp.Id,
+                OrgId = orgId
             });
-            await _employeeOrganizationRepository.InsertAsync(organizations);
+            await _staffOrgRepository.InsertAsync(orgs);
         }
 
         return ResultOutput.Ok();
@@ -265,26 +265,26 @@ public class UserService : BaseService, IUserService, IDynamicApi
         }
 
         // 员工信息
-        var emp = await _employeeRepository.GetAsync(user.Id);
+        var emp = await _staffRepository.GetAsync(user.Id);
         if(emp == null)
         {
-            emp = new EmployeeEntity();
+            emp = new StaffEntity();
         }
         Mapper.Map(input.Emp, emp);
         emp.Id = user.Id;
 
-        await _employeeRepository.InsertOrUpdateAsync(emp);
+        await _staffRepository.InsertOrUpdateAsync(emp);
 
         //所属部门
-        await _employeeOrganizationRepository.DeleteAsync(a => a.EmployeeId == emp.Id);
+        await _staffOrgRepository.DeleteAsync(a => a.StaffId == emp.Id);
         if (input.Emp.OrgIds != null && input.Emp.OrgIds.Any())
         {
-            var organizations = input.Emp.OrgIds.Select(organizationId => new EmployeeOrganizationEntity
+            var orgs = input.Emp.OrgIds.Select(orgId => new StaffOrgEntity
             {
-                EmployeeId = emp.Id,
-                OrganizationId = organizationId
+                StaffId = emp.Id,
+                OrgId = orgId
             });
-            await _employeeOrganizationRepository.InsertAsync(organizations);
+            await _staffOrgRepository.InsertAsync(orgs);
         }
 
         return ResultOutput.Ok();
@@ -343,9 +343,9 @@ public class UserService : BaseService, IUserService, IDynamicApi
     public async Task<IResultOutput> DeleteAsync(long id)
     {
         //删除员工所属部门
-        await _employeeOrganizationRepository.DeleteAsync(a => a.EmployeeId == id);
+        await _staffOrgRepository.DeleteAsync(a => a.StaffId == id);
         //删除员工
-        await _employeeRepository.DeleteAsync(a => a.Id == id);
+        await _staffRepository.DeleteAsync(a => a.Id == id);
         //删除用户角色
         await _userRoleRepository.DeleteAsync(a => a.UserId == id);
         //删除用户
@@ -363,9 +363,9 @@ public class UserService : BaseService, IUserService, IDynamicApi
     public async Task<IResultOutput> BatchDeleteAsync(long[] ids)
     {
         //删除员工所属部门
-        await _employeeOrganizationRepository.DeleteAsync(a => ids.Contains(a.EmployeeId));
+        await _staffOrgRepository.DeleteAsync(a => ids.Contains(a.StaffId));
         //删除员工
-        await _employeeRepository.DeleteAsync(a => ids.Contains(a.Id));
+        await _staffRepository.DeleteAsync(a => ids.Contains(a.Id));
         //删除用户角色
         await _userRoleRepository.DeleteAsync(a => ids.Contains(a.UserId));
         //删除用户
@@ -382,8 +382,8 @@ public class UserService : BaseService, IUserService, IDynamicApi
     [Transaction]
     public async Task<IResultOutput> SoftDeleteAsync(long id)
     {
-        await _employeeOrganizationRepository.DeleteAsync(a => a.EmployeeId == id);
-        await _employeeRepository.SoftDeleteAsync(a => a.Id == id);
+        await _staffOrgRepository.DeleteAsync(a => a.StaffId == id);
+        await _staffRepository.SoftDeleteAsync(a => a.Id == id);
         await _userRoleRepository.DeleteAsync(a => a.UserId == id);
         await _userRepository.SoftDeleteAsync(id);
 
@@ -398,8 +398,8 @@ public class UserService : BaseService, IUserService, IDynamicApi
     [Transaction]
     public async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
     {
-        await _employeeOrganizationRepository.DeleteAsync(a => ids.Contains(a.EmployeeId));
-        await _employeeRepository.SoftDeleteAsync(a => ids.Contains(a.Id));
+        await _staffOrgRepository.DeleteAsync(a => ids.Contains(a.StaffId));
+        await _staffRepository.SoftDeleteAsync(a => ids.Contains(a.Id));
         await _userRoleRepository.DeleteAsync(a => ids.Contains(a.UserId));
         await _userRepository.SoftDeleteAsync(ids);
 

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -1749,196 +1749,6 @@
             Markdown文档
             </summary>
         </member>
-        <member name="T:ZhonTai.Admin.Domain.EmployeeOrganizationEntity">
-            <summary>
-            员工所属部门
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.EmployeeOrganizationEntity.EmployeeId">
-            <summary>
-            员工Id
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.EmployeeOrganizationEntity.Employee">
-            <summary>
-            员工
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.EmployeeOrganizationEntity.OrganizationId">
-            <summary>
-            部门Id
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.EmployeeOrganizationEntity.Organization">
-            <summary>
-            部门
-            </summary>
-        </member>
-        <member name="T:ZhonTai.Admin.Domain.Employee.EmployeeEntity">
-            <summary>
-            员工
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.EmployeeEntity.TenantId">
-            <summary>
-            租户Id
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.EmployeeEntity.JobNumber">
-            <summary>
-            工号
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.EmployeeEntity.Sex">
-            <summary>
-            性别
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.EmployeeEntity.MainOrgId">
-            <summary>
-            主属部门Id
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.EmployeeEntity.ManagerUserId">
-            <summary>
-            直属主管Id
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.EmployeeEntity.Position">
-            <summary>
-            职位
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.EmployeeEntity.EntryTime">
-            <summary>
-            入职时间
-            </summary>
-        </member>
-        <member name="T:ZhonTai.Admin.Domain.Employee.Input.EmployeeAddInput">
-            <summary>
-            添加
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Input.EmployeeAddInput.JobNumber">
-            <summary>
-            工号
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Input.EmployeeAddInput.Sex">
-            <summary>
-            性别
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Input.EmployeeAddInput.MainOrgId">
-            <summary>
-            主属部门Id
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Input.EmployeeAddInput.OrgIds">
-            <summary>
-            所属部门
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Input.EmployeeAddInput.Position">
-            <summary>
-            职位
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Input.EmployeeAddInput.EntryTime">
-            <summary>
-            入职时间
-            </summary>
-        </member>
-        <member name="T:ZhonTai.Admin.Domain.Employee.Input.EmployeeUpdateInput">
-            <summary>
-            修改
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Input.EmployeeUpdateInput.Id">
-            <summary>
-            编号
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Input.EmployeeUpdateInput.Version">
-            <summary>
-            版本
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Output.EmployeeGetOutput.OrganizationName">
-            <summary>
-            主属部门
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Output.EmployeeGetOutput.OrganizationNames">
-            <summary>
-            附属部门
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Output.EmployeeListOutput.Id">
-            <summary>
-            主键Id
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Output.EmployeeListOutput.Name">
-            <summary>
-            姓名
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Output.EmployeeListOutput.NickName">
-            <summary>
-            昵称
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Output.EmployeeListOutput.UserName">
-            <summary>
-            账号
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Output.EmployeeListOutput.JobNumber">
-            <summary>
-            工号
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Output.EmployeeListOutput.OrganizationName">
-            <summary>
-            主属部门
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Output.EmployeeListOutput.OrganizationNames">
-            <summary>
-            附属部门
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Output.EmployeeListOutput.Position">
-            <summary>
-            职位
-            </summary>
-        </member>
-        <member name="P:ZhonTai.Admin.Domain.Employee.Output.EmployeeListOutput.Phone">
-            <summary>
-            手机号
-            </summary>
-        </member>
-        <member name="T:ZhonTai.Admin.Domain.Employee.SexEnum">
-            <summary>
-            性别
-            </summary>
-        </member>
-        <member name="F:ZhonTai.Admin.Domain.Employee.SexEnum.Unknown">
-            <summary>
-            未知
-            </summary>
-        </member>
-        <member name="F:ZhonTai.Admin.Domain.Employee.SexEnum.Male">
-            <summary>
-            男
-            </summary>
-        </member>
-        <member name="F:ZhonTai.Admin.Domain.Employee.SexEnum.Female">
-            <summary>
-            女
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Domain.LogGetPageDto.CreatedUserName">
             <summary>
             创建者
@@ -2034,52 +1844,52 @@
             操作参数
             </summary>
         </member>
-        <member name="T:ZhonTai.Admin.Domain.Organization.OrganizationEntity">
+        <member name="T:ZhonTai.Admin.Domain.Org.OrgEntity">
             <summary>
             组织架构
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Organization.OrganizationEntity.TenantId">
+        <member name="P:ZhonTai.Admin.Domain.Org.OrgEntity.TenantId">
             <summary>
             租户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Organization.OrganizationEntity.ParentId">
+        <member name="P:ZhonTai.Admin.Domain.Org.OrgEntity.ParentId">
             <summary>
             父级
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Organization.OrganizationEntity.Name">
+        <member name="P:ZhonTai.Admin.Domain.Org.OrgEntity.Name">
             <summary>
             名称
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Organization.OrganizationEntity.Code">
+        <member name="P:ZhonTai.Admin.Domain.Org.OrgEntity.Code">
             <summary>
             编码
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Organization.OrganizationEntity.Value">
+        <member name="P:ZhonTai.Admin.Domain.Org.OrgEntity.Value">
             <summary>
             值
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Organization.OrganizationEntity.MemberCount">
+        <member name="P:ZhonTai.Admin.Domain.Org.OrgEntity.MemberCount">
             <summary>
             成员数
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Organization.OrganizationEntity.Description">
+        <member name="P:ZhonTai.Admin.Domain.Org.OrgEntity.Description">
             <summary>
             描述
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Organization.OrganizationEntity.Enabled">
+        <member name="P:ZhonTai.Admin.Domain.Org.OrgEntity.Enabled">
             <summary>
             启用
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Organization.OrganizationEntity.Sort">
+        <member name="P:ZhonTai.Admin.Domain.Org.OrgEntity.Sort">
             <summary>
             排序
             </summary>
@@ -2319,6 +2129,196 @@
             主管理员
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Domain.StaffOrgEntity">
+            <summary>
+            员工所属部门
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.StaffOrgEntity.StaffId">
+            <summary>
+            员工Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.StaffOrgEntity.Staff">
+            <summary>
+            员工
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.StaffOrgEntity.OrgId">
+            <summary>
+            部门Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.StaffOrgEntity.Org">
+            <summary>
+            部门
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Domain.Staff.Input.StaffAddInput">
+            <summary>
+            添加
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Input.StaffAddInput.JobNumber">
+            <summary>
+            工号
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Input.StaffAddInput.Sex">
+            <summary>
+            性别
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Input.StaffAddInput.MainOrgId">
+            <summary>
+            主属部门Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Input.StaffAddInput.OrgIds">
+            <summary>
+            所属部门
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Input.StaffAddInput.Position">
+            <summary>
+            职位
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Input.StaffAddInput.EntryTime">
+            <summary>
+            入职时间
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Domain.Staff.Input.StaffUpdateInput">
+            <summary>
+            修改
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Input.StaffUpdateInput.Id">
+            <summary>
+            编号
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Input.StaffUpdateInput.Version">
+            <summary>
+            版本
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Output.StaffGetOutput.OrgName">
+            <summary>
+            主属部门
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Output.StaffGetOutput.OrgNames">
+            <summary>
+            附属部门
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Output.StaffListOutput.Id">
+            <summary>
+            主键Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Output.StaffListOutput.Name">
+            <summary>
+            姓名
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Output.StaffListOutput.NickName">
+            <summary>
+            昵称
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Output.StaffListOutput.UserName">
+            <summary>
+            账号
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Output.StaffListOutput.JobNumber">
+            <summary>
+            工号
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Output.StaffListOutput.OrgName">
+            <summary>
+            主属部门
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Output.StaffListOutput.OrgNames">
+            <summary>
+            附属部门
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Output.StaffListOutput.Position">
+            <summary>
+            职位
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.Output.StaffListOutput.Phone">
+            <summary>
+            手机号
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Domain.Staff.SexEnum">
+            <summary>
+            性别
+            </summary>
+        </member>
+        <member name="F:ZhonTai.Admin.Domain.Staff.SexEnum.Unknown">
+            <summary>
+            未知
+            </summary>
+        </member>
+        <member name="F:ZhonTai.Admin.Domain.Staff.SexEnum.Male">
+            <summary>
+            男
+            </summary>
+        </member>
+        <member name="F:ZhonTai.Admin.Domain.Staff.SexEnum.Female">
+            <summary>
+            女
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Domain.Staff.StaffEntity">
+            <summary>
+            员工
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.StaffEntity.TenantId">
+            <summary>
+            租户Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.StaffEntity.MainOrgId">
+            <summary>
+            主属部门Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.StaffEntity.ManagerUserId">
+            <summary>
+            直属主管Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.StaffEntity.Position">
+            <summary>
+            职位
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.StaffEntity.JobNumber">
+            <summary>
+            工号
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.StaffEntity.Sex">
+            <summary>
+            性别
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.StaffEntity.EntryTime">
+            <summary>
+            入职时间
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Domain.TenantPermission.TenantPermissionEntity">
             <summary>
             租户权限
@@ -2529,11 +2529,6 @@
             禁用
             </summary>
         </member>
-        <member name="F:ZhonTai.Admin.Domain.User.UserStatusEnum.Locked">
-            <summary>
-            锁定
-            </summary>
-        </member>
         <member name="F:ZhonTai.Admin.Domain.User.UserStatusEnum.WaitChangePasssword">
             <summary>
             待修改密码
@@ -2544,32 +2539,32 @@
             待激活
             </summary>
         </member>
-        <member name="T:ZhonTai.Admin.Domain.User.EmployeeAddInput">
+        <member name="T:ZhonTai.Admin.Domain.User.StaffAddInput">
             <summary>
             员工添加
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.User.EmployeeAddInput.MainOrgId">
+        <member name="P:ZhonTai.Admin.Domain.User.StaffAddInput.MainOrgId">
             <summary>
             主属部门Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.User.EmployeeAddInput.OrgIds">
+        <member name="P:ZhonTai.Admin.Domain.User.StaffAddInput.OrgIds">
             <summary>
             所属部门
             </summary>
         </member>
-        <member name="T:ZhonTai.Admin.Domain.User.EmployeeUpdateInput">
+        <member name="T:ZhonTai.Admin.Domain.User.StaffUpdateInput">
             <summary>
             修改
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.User.EmployeeUpdateInput.Id">
+        <member name="P:ZhonTai.Admin.Domain.User.StaffUpdateInput.Id">
             <summary>
             编号
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.User.EmployeeUpdateInput.Version">
+        <member name="P:ZhonTai.Admin.Domain.User.StaffUpdateInput.Version">
             <summary>
             版本
             </summary>
@@ -2629,98 +2624,6 @@
             任务名称名称
             </summary>
         </member>
-        <member name="T:ZhonTai.Admin.HttpApi.AreaController">
-            <summary>
-            域控制器
-            </summary>
-        </member>
-        <member name="T:ZhonTai.Admin.HttpApi.Controllers.EmployeeController">
-            <summary>
-            员工管理
-            </summary>
-        </member>
-        <member name="M:ZhonTai.Admin.HttpApi.Controllers.EmployeeController.Get(System.Int64)">
-            <summary>
-            查询员工
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.HttpApi.Controllers.EmployeeController.GetPage(ZhonTai.Admin.Core.Dto.PageInput)">
-            <summary>
-            查询员工列表
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.HttpApi.Controllers.EmployeeController.Add(ZhonTai.Admin.Domain.Employee.Input.EmployeeAddInput)">
-            <summary>
-            新增员工
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.HttpApi.Controllers.EmployeeController.Update(ZhonTai.Admin.Domain.Employee.Input.EmployeeUpdateInput)">
-            <summary>
-            修改员工
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.HttpApi.Controllers.EmployeeController.SoftDelete(System.Int64)">
-            <summary>
-            删除员工
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.HttpApi.Controllers.EmployeeController.BatchSoftDelete(System.Int64[])">
-            <summary>
-            批量删除员工
-            </summary>
-            <param name="ids"></param>
-            <returns></returns>
-        </member>
-        <member name="T:ZhonTai.Admin.HttpApi.Controllers.OrganizationController">
-            <summary>
-            组织架构
-            </summary>
-        </member>
-        <member name="M:ZhonTai.Admin.HttpApi.Controllers.OrganizationController.Get(System.Int64)">
-            <summary>
-            查询组织架构
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.HttpApi.Controllers.OrganizationController.GetList(System.String)">
-            <summary>
-            查询组织架构列表
-            </summary>
-            <param name="key"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.HttpApi.Controllers.OrganizationController.Add(ZhonTai.Admin.Services.Organization.Input.OrganizationAddInput)">
-            <summary>
-            新增组织架构
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.HttpApi.Controllers.OrganizationController.Update(ZhonTai.Admin.Services.Organization.Input.OrganizationUpdateInput)">
-            <summary>
-            修改组织架构
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.HttpApi.Controllers.OrganizationController.SoftDelete(System.Int64)">
-            <summary>
-            删除组织架构
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
         <member name="T:ZhonTai.Admin.Services.Api.ApiService">
             <summary>
             接口服务
@@ -3749,70 +3652,6 @@
             文档接口
             </summary>
         </member>
-        <member name="T:ZhonTai.Admin.Services.Employee.EmployeeService">
-            <summary>
-            员工服务
-            </summary>
-        </member>
-        <member name="M:ZhonTai.Admin.Services.Employee.EmployeeService.GetAsync(System.Int64)">
-            <summary>
-            查询员工
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.Services.Employee.EmployeeService.GetPageAsync(ZhonTai.Admin.Core.Dto.PageInput)">
-            <summary>
-            查询分页
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.Services.Employee.EmployeeService.AddAsync(ZhonTai.Admin.Domain.Employee.Input.EmployeeAddInput)">
-            <summary>
-            新增
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.Services.Employee.EmployeeService.UpdateAsync(ZhonTai.Admin.Domain.Employee.Input.EmployeeUpdateInput)">
-            <summary>
-            修改
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.Services.Employee.EmployeeService.DeleteAsync(System.Int64)">
-            <summary>
-            彻底删除
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.Services.Employee.EmployeeService.SoftDeleteAsync(System.Int64)">
-            <summary>
-            删除
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.Services.Employee.EmployeeService.BatchSoftDeleteAsync(System.Int64[])">
-            <summary>
-            批量删除
-            </summary>
-            <param name="ids"></param>
-            <returns></returns>
-        </member>
-        <member name="T:ZhonTai.Admin.Services.Employee.IEmployeeService">
-            <summary>
-            员工服务
-            </summary>
-        </member>
-        <member name="T:ZhonTai.Admin.Services.Employee.MapConfig">
-            <summary>
-            映射配置
-            </summary>
-        </member>
         <member name="T:ZhonTai.Admin.Services.LoginLog.Dto.LoginLogAddInput">
             <summary>
             添加
@@ -4131,149 +3970,149 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="T:ZhonTai.Admin.Services.Organization.Input.OrganizationAddInput">
+        <member name="T:ZhonTai.Admin.Services.Org.Input.OrgAddInput">
             <summary>
             添加
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Input.OrganizationAddInput.ParentId">
+        <member name="P:ZhonTai.Admin.Services.Org.Input.OrgAddInput.ParentId">
             <summary>
             父级
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Input.OrganizationAddInput.Name">
+        <member name="P:ZhonTai.Admin.Services.Org.Input.OrgAddInput.Name">
             <summary>
             名称
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Input.OrganizationAddInput.Code">
+        <member name="P:ZhonTai.Admin.Services.Org.Input.OrgAddInput.Code">
             <summary>
             编码
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Input.OrganizationAddInput.Value">
+        <member name="P:ZhonTai.Admin.Services.Org.Input.OrgAddInput.Value">
             <summary>
             值
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Input.OrganizationAddInput.PrimaryUserId">
+        <member name="P:ZhonTai.Admin.Services.Org.Input.OrgAddInput.PrimaryUserId">
             <summary>
             主管
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Input.OrganizationAddInput.EmployeeCount">
+        <member name="P:ZhonTai.Admin.Services.Org.Input.OrgAddInput.StaffCount">
             <summary>
             员工人数
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Input.OrganizationAddInput.Description">
+        <member name="P:ZhonTai.Admin.Services.Org.Input.OrgAddInput.Description">
             <summary>
             描述
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Input.OrganizationAddInput.Enabled">
+        <member name="P:ZhonTai.Admin.Services.Org.Input.OrgAddInput.Enabled">
             <summary>
             启用
             </summary>
         </member>
-        <member name="T:ZhonTai.Admin.Services.Organization.Input.OrganizationUpdateInput">
+        <member name="T:ZhonTai.Admin.Services.Org.Input.OrgUpdateInput">
             <summary>
             修改
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Input.OrganizationUpdateInput.Id">
+        <member name="P:ZhonTai.Admin.Services.Org.Input.OrgUpdateInput.Id">
             <summary>
             主键Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Input.OrganizationUpdateInput.Version">
+        <member name="P:ZhonTai.Admin.Services.Org.Input.OrgUpdateInput.Version">
             <summary>
             版本
             </summary>
         </member>
-        <member name="T:ZhonTai.Admin.Services.Organization.OrganizationService">
+        <member name="T:ZhonTai.Admin.Services.Org.OrgService">
             <summary>
             部门服务
             </summary>
         </member>
-        <member name="M:ZhonTai.Admin.Services.Organization.OrganizationService.GetAsync(System.Int64)">
+        <member name="M:ZhonTai.Admin.Services.Org.OrgService.GetAsync(System.Int64)">
             <summary>
             查询部门
             </summary>
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Admin.Services.Organization.OrganizationService.GetListAsync(System.String)">
+        <member name="M:ZhonTai.Admin.Services.Org.OrgService.GetListAsync(System.String)">
             <summary>
             查询列表
             </summary>
             <param name="key"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Admin.Services.Organization.OrganizationService.AddAsync(ZhonTai.Admin.Services.Organization.Input.OrganizationAddInput)">
+        <member name="M:ZhonTai.Admin.Services.Org.OrgService.AddAsync(ZhonTai.Admin.Services.Org.Input.OrgAddInput)">
             <summary>
             新增
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Admin.Services.Organization.OrganizationService.UpdateAsync(ZhonTai.Admin.Services.Organization.Input.OrganizationUpdateInput)">
+        <member name="M:ZhonTai.Admin.Services.Org.OrgService.UpdateAsync(ZhonTai.Admin.Services.Org.Input.OrgUpdateInput)">
             <summary>
             修改
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Admin.Services.Organization.OrganizationService.DeleteAsync(System.Int64)">
+        <member name="M:ZhonTai.Admin.Services.Org.OrgService.DeleteAsync(System.Int64)">
             <summary>
             彻底删除
             </summary>
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:ZhonTai.Admin.Services.Organization.OrganizationService.SoftDeleteAsync(System.Int64)">
+        <member name="M:ZhonTai.Admin.Services.Org.OrgService.SoftDeleteAsync(System.Int64)">
             <summary>
             批量删除
             </summary>
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Output.OrganizationListOutput.Id">
+        <member name="P:ZhonTai.Admin.Services.Org.Output.OrgListOutput.Id">
             <summary>
             主键Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Output.OrganizationListOutput.ParentId">
+        <member name="P:ZhonTai.Admin.Services.Org.Output.OrgListOutput.ParentId">
             <summary>
             父级
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Output.OrganizationListOutput.Name">
+        <member name="P:ZhonTai.Admin.Services.Org.Output.OrgListOutput.Name">
             <summary>
             名称
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Output.OrganizationListOutput.Code">
+        <member name="P:ZhonTai.Admin.Services.Org.Output.OrgListOutput.Code">
             <summary>
             编码
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Output.OrganizationListOutput.Value">
+        <member name="P:ZhonTai.Admin.Services.Org.Output.OrgListOutput.Value">
             <summary>
             值
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Output.OrganizationListOutput.Description">
+        <member name="P:ZhonTai.Admin.Services.Org.Output.OrgListOutput.Description">
             <summary>
             描述
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Output.OrganizationListOutput.Enabled">
+        <member name="P:ZhonTai.Admin.Services.Org.Output.OrgListOutput.Enabled">
             <summary>
             启用
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Organization.Output.OrganizationListOutput.CreatedTime">
+        <member name="P:ZhonTai.Admin.Services.Org.Output.OrgListOutput.CreatedTime">
             <summary>
             创建时间
             </summary>