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

src/Hotline.Ai.Jths/AiVisitService.cs

@@ -114,24 +114,24 @@ namespace Hotline.Ai.Jths
                 taskData.VariableList = new List<Variable>();
                
                
-                if (!string.IsNullOrEmpty(item.Order.FromName))
-                {
-                    //来电名称
-                    //开发环境 :OC_SCENE_VAR_FIELD11
-                    //生产环境：OC_SCENE_VAR_FIELD12
-                    taskData.VariableList.Add(new Variable() { Code = visitFromNameKey, Value = item.Order.FromName });
-                }
-                else
-                {
-                    //来电名称
-                    //开发环境 :OC_SCENE_VAR_FIELD11
-                    //生产环境：OC_SCENE_VAR_FIELD12
-                    taskData.VariableList.Add(new Variable() { Code = visitFromNameKey, Value = "市民" });
-                }
-                //来电性别
-                //开发环境: OC_SCENE_VAR_FIELD14
-                //生产环境：OC_SCENE_VAR_FIELD14
-                taskData.VariableList.Add(new Variable() { Code = visitFromGenderKey, Value = item.Order.FromGender == EGender.Female ? "女士" : "先生" });
+                //if (!string.IsNullOrEmpty(item.Order.FromName))
+                //{
+                //    //来电名称
+                //    //开发环境 :OC_SCENE_VAR_FIELD11
+                //    //生产环境：OC_SCENE_VAR_FIELD12
+                //    taskData.VariableList.Add(new Variable() { Code = visitFromNameKey, Value = item.Order.FromName });
+                //}
+                //else
+                //{
+                //    //来电名称
+                //    //开发环境 :OC_SCENE_VAR_FIELD11
+                //    //生产环境：OC_SCENE_VAR_FIELD12
+                //    taskData.VariableList.Add(new Variable() { Code = visitFromNameKey, Value = "市民" });
+                //}
+                ////来电性别
+                ////开发环境: OC_SCENE_VAR_FIELD14
+                ////生产环境：OC_SCENE_VAR_FIELD14
+                //taskData.VariableList.Add(new Variable() { Code = visitFromGenderKey, Value = item.Order.FromGender == EGender.Female ? "女士" : "先生" });
                 //来电时间
                 //开发环境:OC_SCENE_VAR_FIELD17
                 //生产环境：OC_SCENE_VAR_FIELD19
@@ -141,10 +141,10 @@ namespace Hotline.Ai.Jths
                 //生产环境：OC_SCENE_VAR_FIELD20
                 taskData.VariableList.Add(new Variable() { Code = visitOrderTitleKey, Value = item.Order.Title });
 
-                //是否来电工单
-                //开发环境：
-                //生产环境：
-                taskData.VariableList.Add(new Variable() { Code = visitIsCallOrderKey, Value = item.Order.SourceChannelCode == "RGDH" ? "income" : "outbound" });
+                ////是否来电工单
+                ////开发环境：
+                ////生产环境：
+                //taskData.VariableList.Add(new Variable() { Code = visitIsCallOrderKey, Value = item.Order.SourceChannelCode == "RGDH" ? "income" : "outbound" });
                 taskDataList.Add(taskData);
             }
             requestData.TaskDataList = taskDataList;

src/Hotline.Api/Controllers/FwThirdController.cs

@@ -533,7 +533,7 @@ namespace Hotline.Api.Controllers
                 .Where(p => p.IsPublic == true && p.Status == EKnowledgeStatus.OnShelf)
                 .WhereIF(!string.IsNullOrEmpty(dto.Title), p => p.Title.Contains(dto.Title))
                 .WhereIF(!string.IsNullOrEmpty(typeSpliceNameTags), p => SqlFunc.JsonArrayAny(p.Keywords, typeSpliceNameTags) == true)
-                .WhereIF(!string.IsNullOrEmpty(typeSpliceName), x => x.KnowledgeType.Any(t => t.KnowledgeTypeSpliceName.EndsWith("营商环境")))
+                .WhereIF(dto.KnowledgeType == 1, x => x.KnowledgeType.Any(t => t.KnowledgeTypeSpliceName.EndsWith("营商环境")))
                 .OrderByDescending(p => p.CreationTime)
                 .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 

src/Hotline.Share/Dtos/WebPortal/QueryKnowledgeList.cs

@@ -29,6 +29,11 @@ namespace Hotline.Share.Dtos.WebPortal
         /// 知识标签
         /// </summary>
         public string? KnowledgeBaseTags { get; set; }
+
+        /// <summary>
+        /// 是否企业
+        /// </summary>
+        public int? KnowledgeType { get; set; }
     }
 
     public class QueryKnowledgeInfo