田爽 1 سال پیش
والد
کامیت
0149e17733
2فایلهای تغییر یافته به همراه2 افزوده شده و 7 حذف شده
  1. 1 6
      src/Hotline.Api/Controllers/KnowledgeController.cs
  2. 1 1
      src/Hotline/KnowledgeBase/Knowledge.cs

+ 1 - 6
src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -463,11 +463,6 @@ namespace Hotline.Api.Controllers
 		{
 			var typeSpliceName = string.Empty;
 			var hotspotHotSpotFullName = string.Empty;
-			if (!string.IsNullOrEmpty(pagedDto.KnowledgeTypeId))
-			{
-				var type = await _knowledgeTypeRepository.GetAsync(x => x.Id == pagedDto.KnowledgeTypeId);
-				typeSpliceName = type?.SpliceName;
-			}
 			if (!string.IsNullOrEmpty(pagedDto.HotspotId))
 			{
 				var hotspot = await _hotspotTypeRepository.GetAsync(x => x.Id == pagedDto.HotspotId);
@@ -477,8 +472,8 @@ namespace Hotline.Api.Controllers
 			var (total, temp) = await _knowledgeRepository.Queryable(false,false,false)
 				.Includes(x => x.User)
 				.Includes(x => x.SystemOrganize)
-				.Includes(x => x.KnowledgeType)
 				.Includes(x => x.SourceOrganize)
+				.Includes(x => x.HotspotType)
 				.Includes(x=>x.Workflow)
 				.Where(x => x.IsDeleted == false)
 				.Where(x => (x.Status == EKnowledgeStatus.Drafts && x.CreatorId == _sessionContext.UserId) || (x.Status != EKnowledgeStatus.Drafts))

+ 1 - 1
src/Hotline/KnowledgeBase/Knowledge.cs

@@ -26,7 +26,7 @@ public class Knowledge : WorkflowEntity//   WorkflowEntity  FullStateEntity
 	///// <summary>
 	///// 知识分类
 	///// </summary>
-	[SugarColumn(ColumnDataType = "json", IsJson = true,ColumnDescription = "知识分类")]
+	[SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true, ColumnDescription = "知识分类")]
 	public List<Kv>? KnowledgeType { get; set; }
 
 	/// <summary>