Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/WebPortalController.cs

@@ -1371,7 +1371,7 @@ namespace Hotline.Api.Controllers
             var typeSpliceNameTags = string.Empty;
             if (!string.IsNullOrEmpty(dto.KnowledgeBaseTags))
             {
-                var type = await _knowledgeWordRepository.GetAsync(x => x.Tag == dto.KnowledgeBaseTags && x.IsEnable == 0);
+                var type = await _knowledgeWordRepository.GetAsync(x => x.Tag == dto.KnowledgeBaseTags && x.IsEnable == 1);
                 typeSpliceNameTags = type?.Id;
             }
 

src/Hotline.Application/Knowledge/KnowApplication.cs

@@ -338,7 +338,7 @@ namespace Hotline.Application.Knowledge
                     Classify = "普通标签",
                     Remark = "系统自动从知识标题分词",
                     Synonym = "",
-                    IsEnable = 1
+                    IsEnable = 0
                 };
                 var keyId = await _knowledgeWordRepository.AddAsync(wordEntity);
                 keywords.Add(new KnowledgeWordOutDto(keyId, tag));
@@ -463,7 +463,7 @@ namespace Hotline.Application.Knowledge
                         exp.Or(x => x.Summary != null && x.Summary.Contains(keyword));
                     if (dto.RetrievalType == EKnowledgeRetrievalType.KeyWord)
                     {
-                        var keywordEntity = await _knowledgeWordRepository.GetAsync(m => m.Tag == keyword && m.IsEnable == 0);
+                        var keywordEntity = await _knowledgeWordRepository.GetAsync(m => m.Tag == keyword && m.IsEnable == 1);
                         if (keywordEntity is null) continue;
                         exp.Or(x => SqlFunc.JsonArrayAny(x.Keywords, keywordEntity.Id));
                     }
@@ -475,7 +475,7 @@ namespace Hotline.Application.Knowledge
                 var keywords = dto.Content!.GetSegment();
                 var exp = Expressionable.Create<KnowledgeBase.Knowledge>();
                 _knowledgeWordRepository.Queryable()
-                   .Where(m => keywords.Contains(m.Tag) && m.IsEnable == 0)
+                   .Where(m => keywords.Contains(m.Tag) && m.IsEnable == 1)
                    .Select(m => m.Id)
                    .ToList()
                    .ForEach(m =>

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

@@ -96,7 +96,7 @@ namespace Hotline.Share.Dtos.Knowledge
 		public string? Synonym { get; set; }
 
 		/// <summary>
-		/// 启禁用  0  启用  1 禁用
+		/// 启禁用  1  启用  0 禁用
 		/// </summary>
 		public int? IsEnable { get; set; }
 	}

src/Hotline/KnowledgeBase/KnowledgeWord.cs

@@ -45,7 +45,7 @@ namespace Hotline.KnowledgeBase
 		/// <summary>
 		/// 启禁用
 		/// </summary>
-		[SugarColumn(ColumnDescription = "启禁用  0  启用  1 禁用")]
+		[SugarColumn(ColumnDescription = "启禁用  1  启用  0 禁用")]
 		public int IsEnable { get; set; }
 	}
 }