Merge branch 'dev' of http://git.12345lm.cn/Fengwo/hotline into dev

src/Hotline.Api/Controllers/HomeController.cs

@@ -184,6 +184,7 @@ public class HomeController : BaseController
 			IsTranspondCity = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.TranspondCity).SettingValue[0]),
 			IsAverageSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.AverageSendOrder).SettingValue[0]),
             IsOpenJudicialManagement = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.IsOpenJudicialManagement).SettingValue[0]),
+            NoSignOrgCode = _systemSettingCacheManager.GetSetting(SettingConstants.NoSignOrgCode).SettingValue,
         };
         return rsp;
     }

src/Hotline.Api/Controllers/OrderController.cs

@@ -3008,7 +3008,7 @@ public class OrderController : BaseController
             .WhereIF(dto.ExpiredOrAlmostOverdue.HasValue && dto.ExpiredOrAlmostOverdue == false, d => d.NearlyExpiredTime < DateTime.Now && d.ExpiredTime > DateTime.Now)//即将超期 未办
             .Where(d => d.Source < ESource.MLSQ || d.Source > ESource.WZSC)
             .Where(d => d.Status != EOrderStatus.BackToProvince)
-            .Where(d => d.OrderSpecials.Any() == false || d.OrderSpecials.Any(s => s.State == 0) == false)
+            .Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId  == d.Id).NotAny())
             .OrderByDescending(d => d.StartTime)
             .ToPagedListAsync(dto, HttpContext.RequestAborted);
 

src/Hotline.Api/config/appsettings.Development.json

@@ -60,7 +60,7 @@
     }
   },
   "DatabaseConfiguration": {
-    "ApplyDbMigrations": true,
+    "ApplyDbMigrations": false,
     "ApplySeed": false
   },
   "MqConfiguration": {

src/Hotline/Orders/Order.cs

@@ -22,7 +22,7 @@ namespace Hotline.Orders
     /// </summary>
     [Description("工单")]
     [SugarIndex("unique_order_no", nameof(Order.No), OrderByType.Desc, true)]
-    public partial class Order : PositionWorkflowEntity
+	public partial class Order : PositionWorkflowEntity
     {
         public Order()
         {

src/XF.Domain.Repository/Entity.cs

@@ -93,7 +93,7 @@ public abstract class SoftDeleteEntity : Entity, IHasDeletionTime, ISoftDelete
 public abstract class CreationSoftDeleteEntity : CreationEntity, IHasDeletionTime, ISoftDelete
 {
     [SugarColumn(ColumnDescription = "是否删除", DefaultValue = "f")]
-    public bool IsDeleted { get; set; }
+	public bool IsDeleted { get; set; }
 
     /// <summary>
     /// 删除时间

src/XF.Domain/Constants/SettingConstants.cs

@@ -227,7 +227,10 @@ namespace XF.Domain.Constants
         /// </summary>
         public const string IsRecallToSeatDesignated = "IsRecallToSeatDesignated";
 
-
+        /// <summary>
+        /// 不参与会签的部门
+        /// </summary>
+        public const string NoSignOrgCode = "NoSignOrgCode";
         #region 智能外呼
 
         #region 智能回访