From e5642daf4b6820d0706967e486b16e8d33a46d6d Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期四, 26 十二月 2024 14:37:52 +0800
Subject: [PATCH] 1
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs
index 3baf401..934d40c 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs
@@ -82,7 +82,8 @@
//}
//GetPageDataOnExecuted?.Invoke(pageGridData);
- pageGridData = BaseDal.QueryPage(wheres, options.Page, options.Rows, orderbyDic);
+ pageGridData = BaseDal.QueryPage
+ (wheres, options.Page, options.Rows, orderbyDic);
return pageGridData;
}
@@ -129,9 +130,22 @@
if (expressionType == LinqExpressionType.Equal)
{
if (string.IsNullOrEmpty(where))
- where += $"{searchParametersList[i].Name} = '{searchParametersList[i].Value}'";
+ {
+ // 閽堝瀛楃涓茬被鍨嬬殑瀛楁浣跨敤妯＄硦鏌ヨ
+ where += $"{searchParametersList[i].Name} like '%{searchParametersList[i].Value}%'";
+ }
else
- where += $" and {searchParametersList[i].Name} = '{searchParametersList[i].Value}'";
+ {
+ // 閽堝甯冨皵绫诲瀷瀛楁杩涜绮剧‘鏌ヨ
+ if (searchParametersList[i].Value.ToLower() == "true" || searchParametersList[i].Value.ToLower() == "false")
+ {
+ where += $" and {searchParametersList[i].Name} = {searchParametersList[i].Value.ToLower()}";
+ }
+ else
+ {
+ where += $" and {searchParametersList[i].Name} like '%{searchParametersList[i].Value}%'";
+ }
+ }
}
else
{
@@ -164,11 +178,11 @@
}
return sortDic;
}
- else if (propertyInfo.Any(x => x.Name == pageData.Sort))
+ else if (propertyInfo.Any(x => x.Name.ToUpper() == pageData.Sort.ToUpper()))
{
return new Dictionary<string, OrderByType> {
{
- pageData.Sort,pageData.Order?.ToLower() == OrderByType.Asc.ToString() ? OrderByType.Asc : OrderByType.Desc
+ pageData.Sort,pageData.Order?.ToLower() == OrderByType.Asc.ToString().ToLower()? OrderByType.Asc : OrderByType.Desc
} };
}
}
--
Gitblit v1.9.3