用户接口新增当前用户

src/platform/ZhonTai.Admin/Core/Auth/IUser.cs

@@ -49,11 +49,6 @@ public interface IUser
     /// </summary>
     long? TenantId { get; }
 
-    /// <summary>
-    /// 部门Id
-    /// </summary>
-    long? OrgId { get; }
-
     /// <summary>
     /// 租户类型
     /// </summary>
@@ -63,4 +58,10 @@ public interface IUser
     /// 数据库注册键
     /// </summary>
     string DbKey { get; }
+
+
+    /// <summary>
+    /// 当前用户
+    /// </summary>
+    UserEntity CurrentUser { get; }
 }

src/platform/ZhonTai.Admin/Core/Auth/User.cs

@@ -3,6 +3,8 @@ using System;
 using ZhonTai.Common.Extensions;
 using ZhonTai.Admin.Core.Entities;
 using ZhonTai.Admin.Domain.User;
+using Microsoft.Extensions.DependencyInjection;
+using ZhonTai.Admin.Core.Repositories;
 
 namespace ZhonTai.Admin.Core.Auth;
 
@@ -87,13 +89,14 @@ public class User : IUser
     }
 
     /// <summary>
-    /// 部门Id
+    /// 当前用户
     /// </summary>
-    public virtual long? OrgId
+    public virtual UserEntity CurrentUser
     {
         get
         {
-            return null;
+            var userRepsitory = _accessor?.HttpContext?.RequestServices.GetRequiredService<IUserRepository>();
+            return userRepsitory.Get(Id);
         }
     }
 

src/platform/ZhonTai.Admin/Core/Db/DbHelper.cs

@@ -170,7 +170,7 @@ public class DbHelper
                 case "CreatedOrgId":
                     if (e.Value == null || (long)e.Value == default || (long?)e.Value == default)
                     {
-                        e.Value = user.OrgId;
+                        e.Value = user.CurrentUser?.OrgId;
                     }
                     break;
                 case "TenantId":

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

@@ -15,8 +15,14 @@ namespace ZhonTai.Admin.Domain.User;
 /// </summary>
 [Table(Name = "ad_user")]
 [Index("idx_{tablename}_01", nameof(UserName) + "," + nameof(TenantId), true)]
-public partial class UserEntity : EntityBase, ITenant
+public partial class UserEntity : EntityBase, ITenant, IOrg
 {
+    /// <summary>
+    /// 创建者Id
+    /// </summary>
+    [Column(Position = -23, CanUpdate = false)]
+    public long? CreatedOrgId { get; set; }
+
     /// <summary>
     /// 租户Id
     /// </summary>
@@ -60,13 +66,19 @@ public partial class UserEntity : EntityBase, ITenant
     /// </summary>
     public long OrgId { get; set; }
 
-    public OrgEntity MainOrg { get; set; }
+    /// <summary>
+    /// 部门
+    /// </summary>
+    public OrgEntity Org { get; set; }
 
     /// <summary>
     /// 直属主管Id
     /// </summary>
     public long? ManagerUserId { get; set; }
 
+    /// <summary>
+    /// 直属主管
+    /// </summary>
     public UserEntity ManagerUser { get; set; }
 
     /// <summary>

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

@@ -157,11 +157,6 @@
             租户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Auth.IUser.OrgId">
-            <summary>
-            部门Id
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Core.Auth.IUser.TenantType">
             <summary>
             租户类型
@@ -172,6 +167,11 @@
             数据库注册键
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Core.Auth.IUser.CurrentUser">
+            <summary>
+            当前用户
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Core.Auth.PermissionHandler">
             <summary>
             权限处理
@@ -215,9 +215,9 @@
             租户Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Auth.User.OrgId">
+        <member name="P:ZhonTai.Admin.Core.Auth.User.CurrentUser">
             <summary>
-            部门Id
+            当前用户
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Core.Auth.User.Type">
@@ -2684,6 +2684,11 @@
             用户
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.User.UserEntity.CreatedOrgId">
+            <summary>
+            创建者Id
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Domain.User.UserEntity.TenantId">
             <summary>
             租户Id
@@ -2719,11 +2724,21 @@
             主属部门Id
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.User.UserEntity.Org">
+            <summary>
+            部门
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Domain.User.UserEntity.ManagerUserId">
             <summary>
             直属主管Id
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.User.UserEntity.ManagerUser">
+            <summary>
+            直属主管
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Domain.User.UserEntity.NickName">
             <summary>
             昵称