浏览代码

用户 角色 机构

田爽 1 年之前
父节点
当前提交
d03753bded
共有 3 个文件被更改,包括 15 次插入3 次删除
  1. 3 1
      src/Hotline/Identity/Roles/Role.cs
  2. 5 0
      src/Hotline/Settings/SystemOrganize.cs
  3. 7 2
      src/Hotline/Users/User.cs

+ 3 - 1
src/Hotline/Identity/Roles/Role.cs

@@ -13,7 +13,9 @@ namespace Hotline.Identity.Roles
 
         public string DisplayName { get; set; }
 
-        [SugarColumn(IsNullable = true)]
+        public int?  OldRoleId { get; set; }
+
+		[SugarColumn(IsNullable = true)]
         public string? Description { get; set; }
 
 

+ 5 - 0
src/Hotline/Settings/SystemOrganize.cs

@@ -74,6 +74,11 @@ public class SystemOrganize : CreationSoftDeleteEntity
 
     public void InitOrgLevel() => Level = Id.CalcOrgLevel();
 
+    /// <summary>
+    /// 旧系统id
+    /// </summary>
+    public int? oldBmid { get; set; }
+
 }
 
 public static class OrgExtensions

+ 7 - 2
src/Hotline/Users/User.cs

@@ -50,10 +50,15 @@ namespace Hotline.Users
         public EUserType UserType { get; set; }
 
         /// <summary>
-        /// 所属部门
+        /// 旧系统用户id
         /// </summary>
+        public int? OldUserId { get; set; }
 
-        [Navigate(NavigateType.OneToOne, nameof(OrgId))]
+		/// <summary>
+		/// 所属部门
+		/// </summary>
+
+		[Navigate(NavigateType.OneToOne, nameof(OrgId))]
         public SystemOrganize Organization { get; set; }
 
         [Navigate(NavigateType.OneToOne, nameof(Id))]