更新用户表字段，更新用户部门定义

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

@@ -1,12 +1,10 @@
 [
   {
     "id": 161223411986501,
-    "sex": 0,
-    "mainOrgId": 189097691009093
+    "sex": 0
   },
   {
     "id": 162605614280773,
-    "sex": 0,
-    "mainOrgId": 189097750675525
+    "sex": 0
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_staff.tenant.json

@@ -2,13 +2,11 @@
   {
     "id": 161223411986501,
     "tenantId": 161223412138053,
-    "sex": 0,
-    "mainOrgId": 189097691009093
+    "sex": 0
   },
   {
     "id": 162605614280773,
     "tenantId": 161223412138053,
-    "sex": 0,
-    "mainOrgId": 189097750675525
+    "sex": 0
   }
 ]

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

@@ -4,7 +4,8 @@
     "userName": "admin",
     "password": "96E79218965EB72C92A549DD5A330112",
     "name": "管理员",
-    "mobile": "13122223333"
+    "mobile": "13122223333",
+    "mainOrgId": 189097691009093
   },
   {
     "id": 162083448746053,
@@ -17,6 +18,7 @@
     "userName": "user",
     "password": "96E79218965EB72C92A549DD5A330112",
     "name": "员工",
-    "mobile": "13155556666"
+    "mobile": "13155556666",
+    "mainOrgId": 189097750675525
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_user.tenant.json

@@ -5,7 +5,8 @@
     "userName": "admin",
     "password": "96E79218965EB72C92A549DD5A330112",
     "name": "管理员",
-    "mobile": "13122223333"
+    "mobile": "13122223333",
+    "mainOrgId": 189097691009093
   },
   {
     "id": 162083448746053,
@@ -20,6 +21,7 @@
     "userName": "user",
     "password": "96E79218965EB72C92A549DD5A330112",
     "name": "员工",
-    "mobile": "13155556666"
+    "mobile": "13155556666",
+    "mainOrgId": 189097750675525
   }
 ]

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

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

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

@@ -62,7 +62,7 @@ public partial class OrgEntity : EntityFull, ITenant
     /// </summary>
 	public int Sort { get; set; }
 
-    [Navigate(ManyToMany = typeof(StaffOrgEntity))]
+    [Navigate(ManyToMany = typeof(UserOrgEntity))]
     public ICollection<StaffEntity> Staffs { get; set; }
 
     [Navigate(nameof(ParentId))]

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

@@ -3,7 +3,6 @@ using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;
 using ZhonTai.Admin.Domain.Org;
-using ZhonTai.Admin.Domain.User;
 
 namespace ZhonTai.Admin.Domain.Staff;
 
@@ -19,20 +18,6 @@ public partial class StaffEntity : EntityFull, ITenant
     [Column(Position = -10)]
     public long? TenantId { get; set; }
 
-    /// <summary>
-    /// 主属部门Id
-    /// </summary>
-    public long MainOrgId { get; set; }
-
-    public OrgEntity MainOrg { get; set; }
-
-    /// <summary>
-    /// 直属主管Id
-    /// </summary>
-    public long? ManagerUserId { get; set; }
-
-    public UserEntity ManagerUser { get; set; }
-
     /// <summary>
     /// 职位
     /// </summary>
@@ -55,6 +40,10 @@ public partial class StaffEntity : EntityFull, ITenant
     /// </summary>
     public DateTime? EntryTime { get; set; }
 
-    [Navigate(ManyToMany = typeof(StaffOrgEntity))]
-    public ICollection<OrgEntity> Orgs { get; set; }
+
+    /// <summary>
+    /// 个人简介
+    /// </summary>
+    [Column(StringLength = 500)]
+    public string Introduce { get; set; }
 }

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

@@ -6,6 +6,7 @@ using ZhonTai.Admin.Domain.Tenant;
 using ZhonTai.Admin.Domain.Role;
 using ZhonTai.Admin.Domain.UserRole;
 using ZhonTai.Admin.Domain.Staff;
+using ZhonTai.Admin.Domain.Org;
 
 namespace ZhonTai.Admin.Domain.User;
 
@@ -54,6 +55,20 @@ public partial class UserEntity : EntityFull, ITenant
     [Column(StringLength = 100)]
     public string Email { get; set; }
 
+    /// <summary>
+    /// 主属部门Id
+    /// </summary>
+    public long MainOrgId { get; set; }
+
+    public OrgEntity MainOrg { get; set; }
+
+    /// <summary>
+    /// 直属主管Id
+    /// </summary>
+    public long? ManagerUserId { get; set; }
+
+    public UserEntity ManagerUser { get; set; }
+
     /// <summary>
     /// 昵称
     /// </summary>
@@ -78,6 +93,9 @@ public partial class UserEntity : EntityFull, ITenant
     [Navigate(ManyToMany = typeof(UserRoleEntity))]
     public ICollection<RoleEntity> Roles { get; set; }
 
+    [Navigate(ManyToMany = typeof(UserOrgEntity))]
+    public ICollection<OrgEntity> Orgs { get; set; }
+
     /// <summary>
     /// 员工
     /// </summary>

src/platform/ZhonTai.Admin/Domain/StaffOrg/StaffOrgEntity.cs → src/platform/ZhonTai.Admin/Domain/UserOrg/UserOrgEntity.cs

@@ -1,26 +1,26 @@
 using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
-using ZhonTai.Admin.Domain.Staff;
 using ZhonTai.Admin.Domain.Org;
+using ZhonTai.Admin.Domain.User;
 
 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
+[Table(Name = "ad_user_org")]
+[Index("idx_{tablename}_01", nameof(UserId) + "," + nameof(OrgId), true)]
+public partial class UserOrgEntity : EntityAdd
 {
     /// <summary>
-    /// 员工Id
+    /// 用户Id
     /// </summary>
-	public long StaffId { get; set; }
+	public long UserId { get; set; }
 
     /// <summary>
-    /// 员工
+    /// 用户
     /// </summary>
-    public StaffEntity Staff { get; set; }
+    public UserEntity User { get; set; }
 
     /// <summary>
     /// 部门Id

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

@@ -226,10 +226,10 @@ public class CustomGenerateData : GenerateData, IGenerateData
 
         #region 用户部门
 
-        var userOrgs = await db.Queryable<StaffOrgEntity>().ToListAsync(a => new
+        var userOrgs = await db.Queryable<UserOrgEntity>().ToListAsync(a => new
         {
             a.Id,
-            a.StaffId,
+            a.UserId,
             a.OrgId
         });
 
@@ -321,7 +321,7 @@ public class CustomGenerateData : GenerateData, IGenerateData
             SaveDataToJsonFile<StaffEntity>(staffs.Where(a => tenantIds.Contains(a.TenantId.Value)));
         }
         SaveDataToJsonFile<UserRoleEntity>(userRoles);
-        SaveDataToJsonFile<StaffOrgEntity>(userOrgs);
+        SaveDataToJsonFile<UserOrgEntity>(userOrgs);
         SaveDataToJsonFile<ApiEntity>(apiTree);
         SaveDataToJsonFile<ViewEntity>(viewTree);
         SaveDataToJsonFile<PermissionEntity>(permissionTree);

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

@@ -58,7 +58,7 @@ public class CustomSyncData : SyncData, ISyncData
             var userRoles = GetData<UserRoleEntity>();
             await InitDataAsync(db, uow, tran, userRoles, dbConfig);
 
-            var userOrgs = GetData<StaffOrgEntity>();
+            var userOrgs = GetData<UserOrgEntity>();
             await InitDataAsync(db, uow, tran, userOrgs, dbConfig);
 
             var rolePermissions = GetData<RolePermissionEntity>();

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

@@ -35,7 +35,7 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
     private readonly IRepositoryBase<RolePermissionEntity> _rolePermissionRepository;
     private IOrgRepository _orgRepository => LazyGetRequiredService<IOrgRepository>();
     private IStaffRepository _staffRepository => LazyGetRequiredService<IStaffRepository>();
-    private IRepositoryBase<StaffOrgEntity> _empOrgRepository => LazyGetRequiredService<IRepositoryBase<StaffOrgEntity>>();
+    private IRepositoryBase<UserOrgEntity> _empOrgRepository => LazyGetRequiredService<IRepositoryBase<UserOrgEntity>>();
 
     private AppConfig _appConfig => LazyGetRequiredService<AppConfig>();
 
@@ -129,19 +129,20 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
         };
         await _userRepository.InsertAsync(user);
 
+        var userId = user.Id;
+
         //添加员工
         var emp = new StaffEntity
         {
-            Id = user.Id,
-            TenantId = tenantId,
-            MainOrgId = org.Id
+            Id = userId,
+            TenantId = tenantId
         };
         await _staffRepository.InsertAsync(emp);
 
         //添加用户部门
-        var userOrg = new StaffOrgEntity
+        var userOrg = new UserOrgEntity
         {
-            StaffId = user.Id,
+            UserId = userId,
             OrgId = org.Id
         };
         await _empOrgRepository.InsertAsync(userOrg);
@@ -157,13 +158,13 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
         //添加用户角色
         var userRole = new UserRoleEntity() 
         { 
-            UserId = user.Id, 
+            UserId = userId, 
             RoleId = role.Id 
         };
         await _userRoleRepository.InsertAsync(userRole);
 
         //更新租户的用户和角色
-        tenant.UserId = user.Id;
+        tenant.UserId = userId;
         tenant.RoleId = role.Id;
         await _tenantRepository.UpdateAsync(tenant);
 

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

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using ZhonTai.Admin.Domain.Org;
+using System;
+using ZhonTai.Admin.Domain.Staff;
 
 namespace ZhonTai.Admin.Domain.User;
 
@@ -9,14 +9,27 @@ namespace ZhonTai.Admin.Domain.User;
 public class StaffAddInput
 {
     /// <summary>
-    /// 主属部门Id
+    /// 工号
     /// </summary>
-    public long MainOrgId { get; set; }
+    public string JobNumber { get; set; }
 
     /// <summary>
-    /// 所属部门
+    /// 职位
     /// </summary>
-    public long[] OrgIds { get; set; }
+    public string Position { get; set; }
 
-    public ICollection<OrgEntity> Orgs { get; set; }
+    /// <summary>
+    /// 性别
+    /// </summary>
+    public SexEnum? Sex { get; set; }
+
+    /// <summary>
+    /// 入职时间
+    /// </summary>
+    public DateTime? EntryTime { get; set; }
+
+    /// <summary>
+    /// 个人简介
+    /// </summary>
+    public string Introduce { get; set; }
 }

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

@@ -1,4 +1,6 @@
-using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using ZhonTai.Admin.Domain.Org;
 using ZhonTai.Admin.Domain.User;
 
 namespace ZhonTai.Admin.Services.User.Dto;
@@ -41,6 +43,18 @@ public class UserAddInput
     /// </summary>
     public long[] RoleIds { get; set; }
 
+    /// <summary>
+    /// 所属部门
+    /// </summary>
+    public long[] OrgIds { get; set; }
+
+    public ICollection<OrgEntity> Orgs { get; set; }
+
+    /// <summary>
+    /// 主属部门Id
+    /// </summary>
+    public long MainOrgId { get; set; }
+
     /// <summary>
     /// 状态
     /// </summary>

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

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using ZhonTai.Admin.Domain.Org;
 using ZhonTai.Admin.Domain.Role;
 using ZhonTai.Admin.Domain.User;
 
@@ -47,6 +48,18 @@ public partial class UserUpdateInput
     /// </summary>
     public ICollection<RoleEntity> Roles { get; set; }
 
+    /// <summary>
+    /// 所属部门
+    /// </summary>
+    public long[] OrgIds { get; set; }
+
+    public ICollection<OrgEntity> Orgs { get; set; }
+
+    /// <summary>
+    /// 主属部门Id
+    /// </summary>
+    public long MainOrgId { get; set; }
+
     /// <summary>
     /// 状态
     /// </summary>

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

@@ -41,7 +41,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     private ITenantRepository _tenantRepository => LazyGetRequiredService<ITenantRepository>();
     private IApiRepository _apiRepository => LazyGetRequiredService<IApiRepository>();
     private IStaffRepository _staffRepository => LazyGetRequiredService<IStaffRepository>();
-    private IRepositoryBase<StaffOrgEntity> _staffOrgRepository => LazyGetRequiredService<IRepositoryBase<StaffOrgEntity>>();
+    private IRepositoryBase<UserOrgEntity> _userOrgRepository => LazyGetRequiredService<IRepositoryBase<UserOrgEntity>>();
 
     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.Staff.Orgs.Select(b => new OrgEntity { Id = b.Id, Name = b.Name }))
+        .IncludeMany(a => a.Orgs.Select(b => new OrgEntity { Id = b.Id, Name = b.Name }))
         .ToOneAsync(a=>new
         {
             a.Id,
@@ -67,11 +67,15 @@ public class UserService : BaseService, IUserService, IDynamicApi
             a.Mobile,
             a.Email,
             a.Roles,
+            a.Orgs,
+            a.MainOrgId,
             Staff = new
             {
-                a.Staff.Version,
-                a.Staff.Orgs,
-                a.Staff.MainOrgId
+                a.Staff.JobNumber,
+                a.Staff.Sex,
+                a.Staff.Position,
+                a.Staff.Introduce,
+                a.Staff.Version
             }
         });
 
@@ -88,7 +92,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     {
         var orgId = input.Filter;
         var list = await _userRepository.Select
-        .WhereIf(orgId.HasValue && orgId > 0, a => _staffOrgRepository.Where(b => b.StaffId == a.Id && b.OrgId == orgId).Any())
+        .WhereIf(orgId.HasValue && orgId > 0, a => _userOrgRepository.Where(b => b.UserId == a.Id && b.OrgId == orgId).Any())
         .WhereDynamicFilter(input.DynamicFilter)
         .Count(out var total)
         .OrderByDescending(true, a => a.Id)
@@ -205,27 +209,29 @@ public class UserService : BaseService, IUserService, IDynamicApi
             return ResultOutput.NotOk("新增用户失败");
         }
 
+        var userId = user.Id;
+
         //用户角色
         if (input.RoleIds != null && input.RoleIds.Any())
         {
-            var roles = input.RoleIds.Select(roleId => new UserRoleEntity { UserId = user.Id, RoleId = roleId }).ToList();
+            var roles = input.RoleIds.Select(roleId => new UserRoleEntity { UserId = userId, RoleId = roleId }).ToList();
             await _userRoleRepository.InsertAsync(roles);
         }
 
         // 员工信息
         var staff = Mapper.Map<StaffEntity>(input.Staff);
-        staff.Id = user.Id;
+        staff.Id = userId;
         await _staffRepository.InsertAsync(staff);
 
         //所属部门
-        if (input.Staff.OrgIds != null && input.Staff.OrgIds.Any())
+        if (input.OrgIds != null && input.OrgIds.Any())
         {
-            var orgs = input.Staff.OrgIds.Select(orgId => new StaffOrgEntity
+            var orgs = input.OrgIds.Select(orgId => new UserOrgEntity
             {
-                StaffId = staff.Id,
+                UserId = userId,
                 OrgId = orgId
             }).ToList();
-            await _staffOrgRepository.InsertAsync(orgs);
+            await _userOrgRepository.InsertAsync(orgs);
         }
 
         return ResultOutput.Ok();
@@ -263,34 +269,36 @@ public class UserService : BaseService, IUserService, IDynamicApi
         Mapper.Map(input, user);
         await _userRepository.UpdateAsync(user);
 
+        var userId = user.Id;
+
         // 用户角色
-        await _userRoleRepository.DeleteAsync(a => a.UserId == user.Id);
+        await _userRoleRepository.DeleteAsync(a => a.UserId == userId);
         if (input.RoleIds != null && input.RoleIds.Any())
         {
-            var roles = input.RoleIds.Select(roleId => new UserRoleEntity { UserId = user.Id, RoleId = roleId }).ToList();
+            var roles = input.RoleIds.Select(roleId => new UserRoleEntity { UserId = userId, RoleId = roleId }).ToList();
             await _userRoleRepository.InsertAsync(roles);
         }
 
         // 员工信息
-        var staff = await _staffRepository.GetAsync(user.Id);
+        var staff = await _staffRepository.GetAsync(userId);
         if(staff == null)
         {
             staff = new StaffEntity();
         }
         Mapper.Map(input.Staff, staff);
-        staff.Id = user.Id;
+        staff.Id = userId;
         await _staffRepository.InsertOrUpdateAsync(staff);
 
         //所属部门
-        await _staffOrgRepository.DeleteAsync(a => a.StaffId == staff.Id);
-        if (input.Staff.OrgIds != null && input.Staff.OrgIds.Any())
+        await _userOrgRepository.DeleteAsync(a => a.UserId == userId);
+        if (input.OrgIds != null && input.OrgIds.Any())
         {
-            var orgs = input.Staff.OrgIds.Select(orgId => new StaffOrgEntity
+            var orgs = input.OrgIds.Select(orgId => new UserOrgEntity
             {
-                StaffId = staff.Id,
+                UserId = userId,
                 OrgId = orgId
             }).ToList();
-            await _staffOrgRepository.InsertAsync(orgs);
+            await _userOrgRepository.InsertAsync(orgs);
         }
 
         return ResultOutput.Ok();
@@ -348,12 +356,12 @@ public class UserService : BaseService, IUserService, IDynamicApi
     [Transaction]
     public virtual async Task<IResultOutput> DeleteAsync(long id)
     {
-        //删除员工所属部门
-        await _staffOrgRepository.DeleteAsync(a => a.StaffId == id);
         //删除员工
         await _staffRepository.DeleteAsync(a => a.Id == id);
         //删除用户角色
         await _userRoleRepository.DeleteAsync(a => a.UserId == id);
+        //删除员工所属部门
+        await _userOrgRepository.DeleteAsync(a => a.UserId == id);
         //删除用户
         await _userRepository.DeleteAsync(a => a.Id == id);
 
@@ -368,12 +376,12 @@ public class UserService : BaseService, IUserService, IDynamicApi
     [Transaction]
     public virtual async Task<IResultOutput> BatchDeleteAsync(long[] ids)
     {
-        //删除员工所属部门
-        await _staffOrgRepository.DeleteAsync(a => ids.Contains(a.StaffId));
         //删除员工
         await _staffRepository.DeleteAsync(a => ids.Contains(a.Id));
         //删除用户角色
         await _userRoleRepository.DeleteAsync(a => ids.Contains(a.UserId));
+        //删除员工所属部门
+        await _userOrgRepository.DeleteAsync(a => ids.Contains(a.UserId));
         //删除用户
         await _userRepository.DeleteAsync(a => ids.Contains(a.Id));
 
@@ -388,9 +396,9 @@ public class UserService : BaseService, IUserService, IDynamicApi
     [Transaction]
     public virtual async Task<IResultOutput> SoftDeleteAsync(long id)
     {
-        await _staffOrgRepository.DeleteAsync(a => a.StaffId == id);
         await _staffRepository.SoftDeleteAsync(a => a.Id == id);
         await _userRoleRepository.DeleteAsync(a => a.UserId == id);
+        await _userOrgRepository.DeleteAsync(a => a.UserId == id);
         await _userRepository.SoftDeleteAsync(id);
 
         return ResultOutput.Ok();
@@ -404,9 +412,9 @@ public class UserService : BaseService, IUserService, IDynamicApi
     [Transaction]
     public virtual async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
     {
-        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 _userOrgRepository.DeleteAsync(a => ids.Contains(a.UserId));
         await _userRepository.SoftDeleteAsync(ids);
 
         return ResultOutput.Ok();

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

@@ -2144,31 +2144,6 @@
             主管理员
             </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>
             添加
@@ -2304,16 +2279,6 @@
             租户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>
             职位
@@ -2334,6 +2299,11 @@
             入职时间
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.Staff.StaffEntity.Introduce">
+            <summary>
+            个人简介
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Domain.TenantPermission.TenantPermissionEntity">
             <summary>
             租户权限
@@ -2454,6 +2424,31 @@
             说明
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Domain.UserOrgEntity">
+            <summary>
+            用户所属部门
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.UserOrgEntity.UserId">
+            <summary>
+            用户Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.UserOrgEntity.User">
+            <summary>
+            用户
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.UserOrgEntity.OrgId">
+            <summary>
+            部门Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.UserOrgEntity.Org">
+            <summary>
+            部门
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Domain.UserRole.UserRoleEntity">
             <summary>
             用户角色
@@ -2504,6 +2499,16 @@
             邮箱
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.User.UserEntity.MainOrgId">
+            <summary>
+            主属部门Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.User.UserEntity.ManagerUserId">
+            <summary>
+            直属主管Id
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Domain.User.UserEntity.NickName">
             <summary>
             昵称
@@ -2559,14 +2564,29 @@
             员工添加
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.User.StaffAddInput.MainOrgId">
+        <member name="P:ZhonTai.Admin.Domain.User.StaffAddInput.JobNumber">
             <summary>
-            主属部门Id
+            工号
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.User.StaffAddInput.OrgIds">
+        <member name="P:ZhonTai.Admin.Domain.User.StaffAddInput.Position">
             <summary>
-            所属部门
+            职位
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.User.StaffAddInput.Sex">
+            <summary>
+            性别
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.User.StaffAddInput.EntryTime">
+            <summary>
+            入职时间
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.User.StaffAddInput.Introduce">
+            <summary>
+            个人简介
             </summary>
         </member>
         <member name="T:ZhonTai.Admin.Domain.User.StaffUpdateInput">
@@ -5194,6 +5214,16 @@
             角色
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.OrgIds">
+            <summary>
+            所属部门
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.MainOrgId">
+            <summary>
+            主属部门Id
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.Status">
             <summary>
             状态
@@ -5339,6 +5369,16 @@
             角色
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserUpdateInput.OrgIds">
+            <summary>
+            所属部门
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserUpdateInput.MainOrgId">
+            <summary>
+            主属部门Id
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.User.Dto.UserUpdateInput.Status">
             <summary>
             状态