From f0c21ec9c1e9c7cd5db58caeb760c7d7ca6df002 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 16 十二月 2025 08:47:56 +0800
Subject: [PATCH] 公文管理中，“主题词”和“抄送”的字体改为粗宋 完成
---
CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
index 75da3cd..d93cda7 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
@@ -207,7 +207,7 @@
/// <param name="pa"></param>
/// <returns></returns>
public IEnumerable<CoreDeliverOrder> SelectModelPageLishi(Pagination pa, Guid FirmId, int? DriverId, string shipAddress,
- string BuyerName, string createTimeStart, string createTimeEnd,string OrderState)
+ string BuyerName, string createTimeStart, string createTimeEnd,string OrderState,string shifou)
{
string Condition = " and b.FirmId ='" + FirmId + "' ";
@@ -217,7 +217,16 @@
}
else
{
- Condition += " and a.OrderState in( 0,1,2 ) ";
+ if (!string.IsNullOrEmpty(shifou))
+ {
+ Condition += " and a.OrderState in( 0,1 ) ";
+ }
+ else
+ {
+ Condition += " and a.OrderState in( 0,1,2 ) ";
+ }
+
+
}
if (DriverId.HasValue)
{
--
Gitblit v1.9.1