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

src/Hotline.Api/Controllers/OrderController.cs

@@ -4953,7 +4953,8 @@ public class OrderController : BaseController
                 var model = await _orderEarlyWarningRepository.Queryable().Where(x => x.OrderId == order.Id).FirstAsync(HttpContext.RequestAborted);
                 if (model != null)
                 {
-                    _mapper.Map(model.DispatchEarlyWarning, dto.Data.DispatchEarlyWarning);
+                    //model.DispatchEarlyWarning = _mapper.Map<List<EarlyWarningSetting>>(dto.Data.DispatchEarlyWarning);
+                    model.DispatchEarlyWarning = model.CanChooseEarlyWarning?.Where(x => dto.Data.DispatchEarlyWarning.Select(d=>d.Id).Contains(x.Id)).ToList();
                     await _orderEarlyWarningRepository.UpdateAsync(model, HttpContext.RequestAborted);
                     await _publisher.PublishAsync(new OrderEarlyWarningNotify(order, model.DispatchEarlyWarning), PublishStrategy.ParallelWhenAll, HttpContext.RequestAborted);
                 }