Explorar o código

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

田爽 hai 4 meses
pai
achega
e969b2239e

+ 3 - 4
src/Hotline.Application/Orders/OrderApplication.cs

@@ -3782,11 +3782,10 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                                 || (SqlFunc.IsNullOrEmpty(d.WorkflowId) 
                                     && (SqlFunc.IsNullOrEmpty(d.SignerId) || (!SqlFunc.IsNullOrEmpty(d.SignerId) && d.SignerId == _sessionContext.UserId)))
                     )
-                    .Where(d => d.Status < EOrderStatus.Filed
-                        && (d.Status <= EOrderStatus.HandOverToUnAccept
+                    .Where(d => d.Status <= EOrderStatus.HandOverToUnAccept
                         || d.Status == EOrderStatus.Handling//指派给班长再指派回坐席时
-                        || d.Status == EOrderStatus.Countersigning//跨级派单业务如发起会签再回到坐席会签汇总时
-                        ))
+                        //|| d.Status == EOrderStatus.Countersigning//跨级派单业务如发起会签再回到坐席会签汇总时
+                        )
                     ;
 
                 break;

+ 5 - 0
src/Hotline/Settings/SettingConstants.cs

@@ -677,5 +677,10 @@ namespace Hotline.Settings
         /// 企业话机
         /// </summary>
         public const string EnterpriseTel = "EnterpriseTel";
+
+        /// <summary>
+        /// 启用随手拍功能
+        /// </summary>
+        public const string Snapshot = "Snapshot";
     }
 }