From 72390e0230b64cd43fedf0ba8e17aba097568a4a Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 26 六月 2025 16:36:13 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/EntityProperties.cs | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/EntityProperties.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/EntityProperties.cs"
index 2683b7b..c351b8b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/EntityProperties.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/EntityProperties.cs"
@@ -146,7 +146,7 @@
/// <param name="removeNotContains">绉婚櫎涓嶅瓨鍦ㄥ瓧娈�</param>
/// <param name="removerKey">绉婚櫎涓婚敭</param>
/// <returns></returns>
- public static string ValidateDicInEntity(this Type typeinfo, Dictionary<string, object> dic, bool removerKey, PropertyInfo[] propertyInfo, string[] ignoreFields = null)
+ public static string ValidateDicInEntity(this Type typeinfo, Dictionary<string, object> dic, bool removerKey, PropertyInfo[] propertyInfo, string[]? ignoreFields = null)
{
if (dic == null || dic.Count == 0) { return "鍙傛暟鏃犳晥"; }
@@ -168,15 +168,23 @@
foreach (PropertyInfo property in propertyInfo)
{
- SugarColumn sugarColumn = property.GetCustomAttribute<SugarColumn>();
+ SugarColumn? sugarColumn = property.GetCustomAttribute<SugarColumn>();
if (sugarColumn == null)
+ {
+ Navigate? navigate = property.GetCustomAttribute<Navigate>();
+ if(navigate != null)
+ {
+ continue;
+ }
return "璇烽厤缃甋ugarColumn灞炴��";
+ }
+
//蹇界暐涓庝富閿殑瀛楁涓嶅仛楠岃瘉
if (property.Name == keyName.FirstLetterToUpper() || (ignoreFields != null && ignoreFields.Contains(property.Name)) || sugarColumn.IsOnlyIgnoreInsert || sugarColumn.IsOnlyIgnoreUpdate || sugarColumn.IsIgnore)
continue;
//涓嶅湪缂栬緫涓殑鍒楋紝鏄惁涔熻蹇呭～
- if (!dic.ContainsKey(property.Name.FirstLetterToLower()))
+ if (!dic.ContainsKey(property.Name.FirstLetterToLower()) /*&& !dic.ContainsKey(property.Name.FirstLetterToUpper())*/)
{
if (!sugarColumn.IsNullable)
{
@@ -220,9 +228,12 @@
{
foreach (PropertyInfo property in properties)
{
- SugarColumn sugarColumn = property.GetCustomAttribute<SugarColumn>();
- if (sugarColumn.IsPrimaryKey)
- return property.Name;
+ SugarColumn? sugarColumn = property.GetCustomAttribute<SugarColumn>();
+ if (sugarColumn != null)
+ {
+ if (sugarColumn.IsPrimaryKey)
+ return property.Name;
+ }
}
return null;
}
--
Gitblit v1.9.3