tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-20 04:48:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/dotnetcore/FreeSql

Browse Source
This commit is contained in:
2881099
2021-07-06 18:51:01 +08:00
parent def3ebdeff 7af0707f7a
commit d00273ca77
7 changed files with 222 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
FreeSql/Internal/CommonProvider/UpdateProvider.cs
View File

@ -351,8 +351,9 @@ namespace FreeSql.Internal.CommonProvider
{
var cols = columns.Distinct().ToDictionary(a => a);
_ignore.Clear();
IgnoreCanUpdate();
foreach (var col in _table.Columns.Values)
if (cols.ContainsKey(col.Attribute.Name) == true || cols.ContainsKey(col.CsName) == true)
if (!_ignore.ContainsKey(col.Attribute.Name) && (cols.ContainsKey(col.Attribute.Name) == true || cols.ContainsKey(col.CsName) == true))
_ignore.Add(col.Attribute.Name, true);
return this;
}

1
FreeSql/Internal/Model/DynamicFilterInfo.cs
View File

@ -13,6 +13,7 @@ namespace FreeSql.Internal.Model
/// <summary>
/// 动态过滤条件
/// </summary>
[Serializable]
public class DynamicFilterInfo
{
/// <summary>