From c2b4e7c86e790d3880a8da9adeffafb3e6c12145 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 15 五月 2024 09:46:24 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/Controllers/OfflineDistributor/OfflineDistributorController.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/Controllers/OfflineDistributor/OfflineDistributorController.cs b/CoreCms.Net.Web.Admin/Controllers/OfflineDistributor/OfflineDistributorController.cs
index 1e4eff0..e701729 100644
--- a/CoreCms.Net.Web.Admin/Controllers/OfflineDistributor/OfflineDistributorController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/OfflineDistributor/OfflineDistributorController.cs
@@ -150,6 +150,12 @@
{
where = where.And(p => p.School.Contains(School));
}
+ // 鍦版帹浜哄憳
+ var pUserID = Request.Form["pUserID"].FirstOrDefault().ToInt32OrDefault(0);
+ if (pUserID>0)
+ {
+ where = where.And(p => p.PUserID==pUserID);
+ }
//缁忛攢鍟嗗悕绉� varchar
var DealerName = Request.Form["DealerName"].FirstOrDefault();
if (!string.IsNullOrEmpty(DealerName))
@@ -650,7 +656,7 @@
cellNumTemp++;
var rowTemp12 = rowTemp.CreateCell(cellNumTemp);
- rowTemp12.SetCellValue(listModel[i].NegotiationRecord.ToString());
+ rowTemp12.SetCellValue(listModel[i].NegotiationRecord?.ToString());
rowTemp12.CellStyle = commonCellStyle;
cellNumTemp++;
--
Gitblit v1.9.1