TANG JIANG 2 years ago
parent
commit
b672d37c4b

+ 2 - 2
src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -389,8 +389,8 @@ namespace Hotline.Api.Controllers
         [HttpGet("knowretrieval")]
         public async Task<PagedDto<KnowledgeRetrievalDataDto>> KnowRetrieval([FromQuery] KnowledgeRetrievalPagedListDto pagedDto)
         {
-            if (string.IsNullOrEmpty(pagedDto.Keyword))
-                throw UserFriendlyException.SameMessage("请输入关键字");
+            //if (string.IsNullOrEmpty(pagedDto.Keyword))
+            //    throw UserFriendlyException.SameMessage("请输入关键字");
             RefAsync<int> total = 0;
             var temp = await _knowledgeRepository
               .Queryable()

+ 0 - 30
src/Hotline.Repository.SqlSugar/Knowledge/KnowledgeTypeRepository.cs

@@ -12,36 +12,6 @@ namespace Hotline.Repository.SqlSugar.Knowledge
 
         }
 
-        /// <summary>
-        /// 查询树形
-        /// </summary>
-        /// <param name="Id"></param>
-        /// <param name="IsEnable"></param>
-        /// <returns></returns>
-        public async Task<List<KnowledgeType>> GetTree(string Id, string? IsEnable)
-        {
-            return await Db.Queryable<KnowledgeType>().WhereIF(!string.IsNullOrEmpty(IsEnable), p => p.IsEnable == true).Where(p => p.IsDeleted == false).ToTreeAsync(it => it.Child, it => it.ParentId, Id);
-        }
-
-        /// <summary>
-        /// 获取子级
-        /// </summary>
-        /// <param name=""></param>
-        /// <returns></returns>
-        public async Task<List<KnowledgeType>> GetChild(string Id)
-        {
-            return await Db.Queryable<KnowledgeType>().Where(p => p.IsDeleted == false).ToChildListAsync(it => it.ParentId, Id);
-        }
-
-        /// <summary>
-        /// 获取父级
-        /// </summary>
-        /// <param name=""></param>
-        /// <returns></returns>
-        public async Task<List<KnowledgeType>> GetParent(string Id)
-        {
-            return await Db.Queryable<KnowledgeType>().Where(p => p.IsDeleted == false).ToParentListAsync(it => it.ParentId, Id);
-        }
     }
 
 }

+ 0 - 22
src/Hotline/KnowledgeBase/IKnowledgeTypeRepository.cs

@@ -4,28 +4,6 @@ namespace Hotline.KnowledgeBase
 {
     public interface IKnowledgeTypeRepository : IRepository<KnowledgeType>
     {
-        /// <summary>
-        /// 查询树形
-        /// </summary>
-        /// <param name="Id"></param>
-        /// <param name="IsEnable"></param>
-        /// <returns></returns>
-        Task<List<KnowledgeType>> GetTree(string Id, string? IsEnable);
-
-        /// <summary>
-        /// 获取子级
-        /// </summary>
-        /// <param name=""></param>
-        /// <returns></returns>
-        Task<List<KnowledgeType>> GetChild(string Id);
-
-        /// <summary>
-        /// 获取父级
-        /// </summary>
-        /// <param name=""></param>
-        /// <returns></returns>
-        Task<List<KnowledgeType>> GetParent(string Id);
-
 
     }
 }

+ 2 - 2
src/Hotline/KnowledgeBase/KnowledgeTypeDomainService.cs

@@ -115,7 +115,7 @@ namespace Hotline.KnowledgeBase
             if (type.IsEnable)//启用
             {
                 //查询子级数据
-                var getChild = await _knowledgeTypeRepository.GetChild(Id);
+                var getChild = await _knowledgeTypeRepository.Queryable().ToChildListAsync(it => it.ParentId, Id);//.GetChild(Id);
                 //禁用子级数据
                 if (getChild != null && getChild.Count > 0)
                 {
@@ -158,7 +158,7 @@ namespace Hotline.KnowledgeBase
             if (type.IsEnable)//启用状态
             {
                 //查询子级数据
-                var getChild = await _knowledgeTypeRepository.GetChild(Id);
+                var getChild = await _knowledgeTypeRepository.Queryable().ToChildListAsync(it => it.ParentId, Id);// await _knowledgeTypeRepository.GetChild(Id);
                 //禁用子级数据
                 if (getChild != null && getChild.Count > 0)
                 {