Merge branch 'master' of http://git.fwt.com/Hotline/hotline

src/Hotline.Api/Controllers/HomeController.cs

@@ -77,13 +77,13 @@ public class HomeController : BaseController
     {
         var db = _uow.Db;
         db.DbMaintenance.CreateDatabase();
-        db.CodeFirst.InitTables<Blacklist,Call,CallDetail,CallRecord,TelHold>();
-        db.CodeFirst.InitTables<Ivr, IvrCategory, Tel, TelGroup, TelRest>();
-        db.CodeFirst.InitTables<Knowledge, KnowledgeApply, KnowledgePv, KnowledgeStandard, KnowledgeTemp>();
+        //db.CodeFirst.InitTables<Blacklist,Call,CallDetail,CallRecord,TelHold>();
+        //db.CodeFirst.InitTables<Ivr, IvrCategory, Tel, TelGroup, TelRest>();
+        db.CodeFirst.InitTables<KnowledgeType>();
         //db.CodeFirst.InitTables<KnowledgeType, Orders.Order, OrderTemporary, OrgUser>();
-        db.CodeFirst.InitTables<SystemAuthority, SystemButton, SystemDataAuthority, SystemDataTable, SystemMenu>();
-        db.CodeFirst.InitTables<SystemOrganize, SystemSetting, SystemSettingGroup, UserFastMenu>();
-        db.CodeFirst.InitTables<User, Work,SysDicType,SysDicData, TrunkIvrManager>();
+        //db.CodeFirst.InitTables<SystemAuthority, SystemButton, SystemDataAuthority, SystemDataTable, SystemMenu>();
+        //db.CodeFirst.InitTables<SystemOrganize, SystemSetting, SystemSettingGroup, UserFastMenu>();
+        //db.CodeFirst.InitTables<User, Work,SysDicType,SysDicData, TrunkIvrManager>();
         return Task.CompletedTask;
     }
 

src/Hotline.Api/Controllers/KnowledgeCommonController.cs

@@ -34,7 +34,7 @@ namespace Hotline.Api.Controllers
             _knowledgeTypeDomainService = knowledgeTypeDomainService;
             _knowledgeStandardRepository = knowledgeStandardRepository;
             _mapper = mapper;
-        } 
+        }
         #endregion
 
         #region 知识分类
@@ -128,23 +128,23 @@ namespace Hotline.Api.Controllers
         /// <summary>
         /// 知识分类- 获取层级分类
         /// </summary>
-        /// <param name="IsEnable">不传查询所有，包含已经禁用的，不为空只查询已经启用了的数据</param>
+        /// <param name="IsEnable">不传查询所有</param>
         /// <returns></returns>
         [Permission(EPermission.KnowledgeTypeMange)]
         [HttpGet("treelist")]
-        public async Task<List<KnowledgeType>> GetTreeList(string? IsEnable)
+        public async Task<List<KnowledgeType>> GetTreeList(bool? IsEnable)
         {
-            return await _knowledgeTypeRepository.GetTree(Guid.Empty.ToString(), IsEnable);
+            return await _knowledgeTypeRepository.Queryable().WhereIF(IsEnable.HasValue, p => p.IsEnable == IsEnable).ToTreeAsync(it => it.Child, it => it.ParentId, null);
         }
 
         /// <summary>
         /// 知识分类- 只获取一级
         /// </summary>
         /// <param name="ParentId">不传默认查询第一级</param>
-        /// <param name="IsEnable">不传查询所有，包含已经禁用的，不为空只查询已经启用了的数据</param>
+        /// <param name="IsEnable">不传查询所有，包含已经禁用的</param>
         /// <returns></returns>
         [HttpGet("typelist")]
-        public async Task<List<KnowledgeType>> GetTypeList(string? ParentId, string? IsEnable)
+        public async Task<List<KnowledgeType>> GetTypeList(string? ParentId, bool? IsEnable)
         {
             if (string.IsNullOrEmpty(ParentId))
                 ParentId = Guid.Empty.ToString();
@@ -152,7 +152,7 @@ namespace Hotline.Api.Controllers
             return await _knowledgeTypeRepository
                 .Queryable()
                 .Where(p => p.ParentId == ParentId && p.IsDeleted == false)
-                .WhereIF(!string.IsNullOrEmpty(IsEnable), p => p.IsEnable == true)
+                .WhereIF(IsEnable.HasValue, p => p.IsEnable == IsEnable)
                 .OrderByDescending(p => p.Sort)
                 .ToListAsync();
         }

src/Hotline.Share/Dtos/Knowledge/KnowledgeTypeDto.cs

@@ -24,7 +24,7 @@
         /// <summary>
         /// 父级ID
         /// </summary>
-        public string ParentId { get; set; } = Guid.Empty.ToString();
+        public string? ParentId { get; set; } 
 
         /// <summary>
         /// 排序

src/Hotline/KnowledgeBase/KnowledgeType.cs

@@ -1,4 +1,5 @@
-using XF.Domain.Repository;
+using SqlSugar;
+using XF.Domain.Repository;
 
 namespace Hotline.KnowledgeBase;
 
@@ -33,7 +34,8 @@ public class KnowledgeType : FullStateEntity
     /// <summary>
     /// 父级ID
     /// </summary>
-    public string ParentId { get; set; }
+    [SugarColumn(IsNullable = true)]
+    public string? ParentId { get; set; }
 
     /// <summary>
     /// 子级