Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

src/Hotline.Api/Controllers/KnowledgeCommonController.cs

@@ -132,7 +132,7 @@ namespace Hotline.Api.Controllers
         [HttpGet("treelist")]
         public async Task<List<KnowledgeType>> GetTreeList(bool? IsEnable)
         {
-            return await _knowledgeTypeRepository.Queryable().WhereIF(IsEnable.HasValue, p => p.IsEnable == IsEnable).ToTreeAsync(it => it.children, it => it.ParentId, null);
+            return await _knowledgeTypeRepository.Queryable().WhereIF(IsEnable.HasValue, p => p.IsEnable == IsEnable).ToTreeAsync(it => it.children, it => it.ParentId, null,it=> it.Id);
         }
 
         /// <summary>

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; }
 
 

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

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))]