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

src/Hotline.Api/Controllers/KnowledgeCommonController.cs

@@ -1,9 +1,7 @@
 using Hotline.KnowledgeBase;
 using Hotline.Permissions;
-using Hotline.Repository.SqlSugar.Knowledge;
 using Hotline.Share.Dtos.Knowledge;
 using MapsterMapper;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using XF.Domain.Exceptions;
 
@@ -150,7 +148,7 @@ namespace Hotline.Api.Controllers
 
             return await _knowledgeTypeRepository
                 .Queryable()
-                .Where(p => p.ParentId == ParentId)
+                .Where(p => p.ParentId == ParentId && p.IsDeleted == false)
                 .WhereIF(!string.IsNullOrEmpty(IsEnable), p => p.IsEnable == true)
                 .OrderByDescending(p => p.Sort)
                 .ToListAsync();
@@ -168,7 +166,7 @@ namespace Hotline.Api.Controllers
         public async Task<KnowledgeStandard> GetStandard()
         {
             var sandard = await _knowledgeStandardRepository.Queryable().FirstAsync();
-            if (sandard ==null)
+            if (sandard == null)
             {
                 KnowledgeStandard standard = new()
                 {

src/Hotline.Repository.SqlSugar/Knowledge/KnowledgeTypeRepository.cs

@@ -20,7 +20,7 @@ namespace Hotline.Repository.SqlSugar.Knowledge
         /// <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).ToTreeAsync(it => it.Child, it => it.ParentId, Id);
+            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>
@@ -30,7 +30,7 @@ namespace Hotline.Repository.SqlSugar.Knowledge
         /// <returns></returns>
         public async Task<List<KnowledgeType>> GetChild(string Id)
         {
-            return await Db.Queryable<KnowledgeType>().ToChildListAsync(it => it.ParentId, Id);
+            return await Db.Queryable<KnowledgeType>().Where(p => p.IsDeleted == false).ToChildListAsync(it => it.ParentId, Id);
         }
 
         /// <summary>
@@ -40,7 +40,7 @@ namespace Hotline.Repository.SqlSugar.Knowledge
         /// <returns></returns>
         public async Task<List<KnowledgeType>> GetParent(string Id)
         {
-            return await Db.Queryable<KnowledgeType>().ToParentListAsync(it => it.ParentId, Id);
+            return await Db.Queryable<KnowledgeType>().Where(p => p.IsDeleted == false).ToParentListAsync(it => it.ParentId, Id);
         }
     }
 

src/Hotline/KnowledgeBase/KnowledgeType.cs

@@ -5,7 +5,7 @@ namespace Hotline.KnowledgeBase;
 /// <summary>
 /// 知识分类
 /// </summary>
-public class KnowledgeType : CreationEntity
+public class KnowledgeType : FullStateEntity
 {
     /// <summary>
     /// 类型名称

src/Hotline/KnowledgeBase/KnowledgeTypeDomainService.cs

@@ -89,11 +89,11 @@ namespace Hotline.KnowledgeBase
             //查询是否有数据
             if (!string.IsNullOrEmpty(Id))
             {
-                var type = await _knowledgeTypeRepository.GetAsync(p => p.Id == Id, cancellationToken);
+                var type = await _knowledgeTypeRepository.GetAsync(p => p.Id == Id && p.IsDeleted == false, cancellationToken);
                 _mapper.Map(type, knowledgeTypeDto);
             }
             //查询已经启用的分类名称
-            var list = await _knowledgeTypeRepository.QueryAsync(p => p.IsEnable == true);
+            var list = await _knowledgeTypeRepository.QueryAsync(p => p.IsEnable == true && p.IsDeleted == false);
             //分类组装树形
             knowledgeTypeDto.TreeLists = GetChildren(list, Guid.Empty.ToString(), ParentId);
 
@@ -109,7 +109,7 @@ namespace Hotline.KnowledgeBase
         public async Task ChangeStateType(string Id, CancellationToken cancellationToken)
         {
             //查询数据是否存在
-            var type = await _knowledgeTypeRepository.GetAsync(Id);
+            var type = await _knowledgeTypeRepository.GetAsync(p => p.Id == Id && p.IsDeleted == false, cancellationToken);
             if (type is null)
                 throw UserFriendlyException.SameMessage("分类不存在！");
             if (type.IsEnable)//启用
@@ -129,7 +129,7 @@ namespace Hotline.KnowledgeBase
             else //禁用
             {
                 //查询上级是否是启用状态，如果是禁用状态不能修改
-                var CheckParent = await _knowledgeTypeRepository.GetAsync(type.ParentId, cancellationToken);
+                var CheckParent = await _knowledgeTypeRepository.GetAsync(p => p.Id == type.ParentId && p.IsDeleted == false, cancellationToken);
                 if (CheckParent is null)
                     throw UserFriendlyException.SameMessage("分类启用失败！");
                 if (!CheckParent.IsEnable)
@@ -150,7 +150,7 @@ namespace Hotline.KnowledgeBase
         public async Task ChangeStateTypeAndOffShelf(string Id, CancellationToken cancellationToken)
         {
             //查询数据是否存在
-            var type = await _knowledgeTypeRepository.GetAsync(Id, cancellationToken);
+            var type = await _knowledgeTypeRepository.GetAsync(p => p.Id == Id, cancellationToken);
             if (type is null)
                 throw UserFriendlyException.SameMessage("分类不存在！");
             if (type.IsEnable)//启用状态
@@ -194,12 +194,12 @@ namespace Hotline.KnowledgeBase
         public async Task RemoveType(string Id, CancellationToken cancellationToken)
         {
             //查询数据是否存在
-            var sandard = await _knowledgeTypeRepository.GetAsync(Id, cancellationToken);
+            var sandard = await _knowledgeTypeRepository.GetAsync(p => p.Id == Id && p.IsDeleted == false, cancellationToken);
             if (sandard is null)
                 throw UserFriendlyException.SameMessage("分类不存在！");
 
             //查询是否有子级分类
-            var checkChild = await _knowledgeTypeRepository.CountAsync(p => p.ParentId == Id, cancellationToken);
+            var checkChild = await _knowledgeTypeRepository.CountAsync(p => p.ParentId == Id && p.IsDeleted == false, cancellationToken);
             if (checkChild > 0)
                 throw UserFriendlyException.SameMessage("存在子级分类！");
 
@@ -209,7 +209,7 @@ namespace Hotline.KnowledgeBase
                 throw UserFriendlyException.SameMessage("分类存在知识！");
 
             //删除操作
-            await _knowledgeTypeRepository.RemoveAsync(sandard, false, cancellationToken);
+            await _knowledgeTypeRepository.RemoveAsync(sandard, true, cancellationToken);
         }
 
         #region 私有方法