From f8ed0a1ee63cad489c67caaf76e9527a06da2947 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期三, 29 五月 2024 17:01:56 +0800
Subject: [PATCH] no message
---
CoreCms.Net.Web.Admin/Controllers/baifenbingfa/CoreCmsProductsController.cs | 27 ++++++++++++++-------------
CoreCms.Net.Repository/baifenbingfa/CoreCmsProductsRepository.cs | 11 ++++++-----
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/CoreCms.Net.Repository/baifenbingfa/CoreCmsProductsRepository.cs b/CoreCms.Net.Repository/baifenbingfa/CoreCmsProductsRepository.cs
index 09e2829..89d99ff 100644
--- a/CoreCms.Net.Repository/baifenbingfa/CoreCmsProductsRepository.cs
+++ b/CoreCms.Net.Repository/baifenbingfa/CoreCmsProductsRepository.cs
@@ -288,7 +288,7 @@
spesDesc = product.spesDesc,
isDefalut = product.isDefalut,
images = product.images,
- isDel = good.isDel,
+ isDel = good.isDel| product.isDel,
name = good.name,
bn = good.bn,
isMarketable = good.isMarketable,
@@ -331,7 +331,7 @@
spesDesc = product.spesDesc,
isDefalut = product.isDefalut,
images = product.images,
- isDel = good.isDel,
+ isDel = good.isDel | product.isDel ,
name = good.name,
bn = good.bn,
isMarketable = good.isMarketable,
@@ -394,7 +394,8 @@
spesDesc = product.spesDesc,
isDefalut = product.isDefalut,
images = product.images,
- isDel = good.isDel,
+
+ isDel = good.isDel | product.isDel,
name = good.name,
bn = good.bn,
isMarketable = good.isMarketable,
@@ -436,8 +437,8 @@
points = product.points,
spesDesc = product.spesDesc,
isDefalut = product.isDefalut,
- images = product.images,
- isDel = good.isDel,
+ images = product.images,
+ isDel = good.isDel | product.isDel,
name = good.name,
bn = good.bn,
isMarketable = good.isMarketable,
diff --git a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/CoreCmsProductsController.cs b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/CoreCmsProductsController.cs
index c12cfe2..ac219c9 100644
--- a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/CoreCmsProductsController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/CoreCmsProductsController.cs
@@ -217,18 +217,19 @@
{
where = where.And(p => p.images.Contains(images));
}
- //鏄惁鍒犻櫎 bit
- var isDel = Request.Form["isDel"].FirstOrDefault();
- if (!string.IsNullOrEmpty(isDel) && isDel.ToLowerInvariant() == "true")
- {
- where = where.And(p => p.isDel == true);
- }
- else if (!string.IsNullOrEmpty(isDel) && isDel.ToLowerInvariant() == "false")
- {
- where = where.And(p => p.isDel == false);
- }
- // decimal
- var distributionPrice = Request.Form["distributionPrice"].FirstOrDefault().ObjectToDecimal(0);
+ ////鏄惁鍒犻櫎 bit
+ //var isDel = Request.Form["isDel"].FirstOrDefault();
+ // if (!string.IsNullOrEmpty(isDel) && isDel.ToLowerInvariant() == "true")
+ // {
+ // where = where.And(p => p.isDel == true);
+ // }
+ // else if (!string.IsNullOrEmpty(isDel) && isDel.ToLowerInvariant() == "false")
+ // {
+ // where = where.And(p => p.isDel == false);
+ // }
+ where = where.And(p => p.isDel == false);
+ // decimal
+ var distributionPrice = Request.Form["distributionPrice"].FirstOrDefault().ObjectToDecimal(0);
if (distributionPrice > 0)
{
where = where.And(p => p.distributionPrice == distributionPrice);
@@ -246,7 +247,7 @@
where = where.And(p => p.distributionCutMoney == distributionCutMoney);
}
- //鏄惁鍒犻櫎 bit
+ //鏄惁瀹氬埗 bit
var isCustomizable = Request.Form["isCustomizable"].FirstOrDefault();
if (!string.IsNullOrEmpty(isCustomizable) && isCustomizable.ToLowerInvariant() == "true")
{
--
Gitblit v1.9.1