From 8c8404c55a863844cc674a8bedb2cfdb92c1c288 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期六, 08 二月 2025 09:04:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into cyronghe
---
cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
index 0c43d87..d1a91ae 100644
--- a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
+++ b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
@@ -59,7 +59,7 @@
Expression<Func<Order, bool>> expression = t => true;
expression = expression.And(t => t.IsDeleted == false && t.IsEn == true && t.OrderStatus == 0);
- expression = expression.And(t => t.WordStartTime >= DateTime.Now.Date.AddDays(-30));
+ // expression = expression.And(t => t.WordEndTime >= DateTime.Now.Date.AddDays(-30));
if (!string.IsNullOrEmpty(page.OrderName))
{
expression = expression.And(t => t.OrderName.Contains(page.OrderName));
@@ -263,6 +263,10 @@
var orderBiddingWorkPriceRepository = new BaseRepository<OrderBiddingWorkPrice>();
var userRes = new BaseRepository<User>();
var order = await orderRes.GetByIdAsync(orderid);
+ if (order.IsDeleted == true)
+ {
+ throw Oops.Oh("璁㈠崟宸茬粡鍒犻櫎鏃犳硶鏌ョ湅锛�");
+ }
orderDto = _mapper.Map<OrderDto>(order);
switch (orderDto.OrderStatus)
{
@@ -310,7 +314,7 @@
}
}
- orderBiddings = orderBiddings.Where(x => (x.IsSelected == null || x.IsSelected != false)).ToList();
+ orderBiddings = orderBiddings.Where(x => (x.IsSelected == null || x.IsSelected != false)).OrderBy(x=>x.IsSelected).ToList();
var orderBiddingDtos = _mapper.Map<List<OrderBiddingDto>>(orderBiddings);
if(orderBiddingDtos != null&& orderBiddingDtos.Count > 0)
{
--
Gitblit v1.9.1