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

src/Hotline.Api/Controllers/OrderController.cs

@@ -3994,12 +3994,15 @@ public class OrderController : BaseController
         //泸州任务 311 投诉件需限制受理内容的字数等需求
         if (_appOptions.Value.IsLuZhou && dto.AcceptTypeCode == "35")
         {
-            if (dto.Content.Length < 25)
-                throw UserFriendlyException.SameMessage("保存失败，投诉类型受理内容字数需要至少25个字!");
+            if (dto.SourceChannelCode != "S12345" && dto.SourceChannelCode != "SZMHD" && dto.SourceChannelCode != "XCX" && dto.SourceChannelCode != "JCeT")
+            {
+                if (dto.Content.Length < 25)
+                    throw UserFriendlyException.SameMessage("保存失败，投诉类型受理内容字数需要至少25个字!");
 
-            if (dto.Title.Contains("咨询") || dto.Title.Contains("建议") || dto.Title.Contains("求助") || dto.Title.Contains("举报")
-                || dto.Content.Contains("咨询") || dto.Content.Contains("建议") || dto.Content.Contains("求助") || dto.Content.Contains("举报"))
-                throw UserFriendlyException.SameMessage("保存失败！投诉类型标题和受理内容不能出现'咨询、建议、求助、举报'");
+                if (dto.Title.Contains("咨询") || dto.Title.Contains("建议") || dto.Title.Contains("求助") || dto.Title.Contains("举报")
+                    || dto.Content.Contains("咨询") || dto.Content.Contains("建议") || dto.Content.Contains("求助") || dto.Content.Contains("举报"))
+                    throw UserFriendlyException.SameMessage("保存失败！投诉类型标题和受理内容不能出现'咨询、建议、求助、举报'");
+            }
         }
 
         //todo dto validation
@@ -8894,7 +8897,7 @@ public class OrderController : BaseController
     public async Task<List<NotificationWaitSendDto>> GetNotificationWaitSend(string userId)
     {
         var data = await _notificationWaitSendRepository.Queryable()
-                .Where(p => p.UserId == userId && p.Method == RealtimeMethods.OrderComplementRecord&&p.State=="0")
+                .Where(p => p.UserId == userId && p.Method == RealtimeMethods.OrderComplementRecord && p.State == "0")
                 .ToListAsync();
         if (data != null && data.Count > 0)
         {