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

src/Hotline.Api/Controllers/OrderController.cs

@@ -4191,8 +4191,8 @@ public class OrderController : BaseController
         {
             query.WhereIF(dto.QueryType is 1, d => d.IsForwarded == false)
                 .WhereIF(dto.QueryType is 2, d => d.IsForwarded == true)
-                //.Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId == d.Id && os.IsDeleted == false && os.SpecialType == ESpecialType.ReTransact)
-                //    .NotAny())
+                .Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId == d.Id && os.IsDeleted == false && os.SpecialType == ESpecialType.ReTransact)
+                    .NotAny())
                 ;
         }
 
@@ -4206,10 +4206,7 @@ public class OrderController : BaseController
             .Where(d => SqlFunc.Subqueryable<OrderDelay>().Where(od => od.OrderId == d.Id && od.IsDeleted == false && od.DelayState == EDelayState.Examining).NotAny())
             .Where(d => SqlFunc.Subqueryable<OrderSendBackAudit>().Where(osba => osba.OrderId == d.Id && osba.IsDeleted == false && osba.State == ESendBackAuditState.Apply)
                 .NotAny())
-            .Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(s => s.OrderId == d.Id && s.State == 0 && s.IsDeleted == false )
-	            .WhereIF(dto.QueryType != null && ( dto.QueryType == 1 || dto.QueryType == 2),s =>  s.SpecialType == ESpecialType.ReTransact)
-	            //.WhereIF(dto.QueryType != null && dto.QueryType == 3, s =>  s.SpecialType != ESpecialType.ReTransact)
-				.NotAny())
+            .Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(s => s.OrderId == d.Id && s.State == 0 && s.IsDeleted == false ).NotAny())
             .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.StartsWith(dto.Keyword))
             .WhereIF(!string.IsNullOrEmpty(dto.No), d => d.No == dto.No)

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

@@ -33,10 +33,6 @@ namespace Hotline.Share.Dtos.Knowledge
     /// </summary>
     public class AddKnowledgeDto : KnowledgeDto
     {
-	    /// <summary>
-	    /// 知识来源
-	    /// </summary>
-	    public string? Source { get; set; }
 
 		/// <summary>
 		/// 知识Code
@@ -142,10 +138,16 @@ namespace Hotline.Share.Dtos.Knowledge
 	/// </summary>
 	public class KnowledgeDto : KnowledgeBaseDto
 	{
-        /// <summary>
-        /// 知识分类
-        /// </summary>
-        public List<KnowledgeRelationTypeDto> KnowledgeType { get; set; }
+
+		/// <summary>
+		/// 知识来源
+		/// </summary>
+		public string? Source { get; set; }
+
+		/// <summary>
+		/// 知识分类
+		/// </summary>
+		public List<KnowledgeRelationTypeDto> KnowledgeType { get; set; }
 
         /// <summary>
         /// 知识分类名称
@@ -273,11 +275,6 @@ namespace Hotline.Share.Dtos.Knowledge
 
         public List<FileJson>? FileJson { get; set; }
 
-        /// <summary>
-        /// 来源
-        /// </summary>
-        public string? Source { get; set; }
-
 	}
 
     public class KnowledgeBaseDto {