- 修复 DbSet/Repository CompareState 报错的问题；#1994

Author: 2881099

Examples/base_entity/Program.cs

@@ -621,6 +621,19 @@ static void Main(string[] args)
             BaseEntity.Initialization(fsql, () => _asyncUow.Value);
             #endregion
 
+            fsql.InsertOrUpdate<AppInfoEntity>().SetSource(new AppInfoEntity { AppID = "03DN8CW8", AppName = "app_01" }).ExecuteAffrows();
+            var repo2211 = fsql.GetRepository<AppInfoEntity>();
+
+            var appInfo = repo2211.Where(info => info.AppID == "03DN8CW8").First();
+            appInfo = repo2211.Where(info => info.AppID == "03DN8CW8").First();
+            var compareDic = new Dictionary<string, object[]>();
+            var updateInfo = "";
+
+            repo2211.Attach(appInfo);
+            appInfo.AppName = "测试";
+            compareDic = repo2211.CompareState(appInfo);
+            Console.WriteLine(appInfo.AppName);
+
             var sql20250205 = fsql.Select<OrderLine, Product>()
                 .InnerJoin((l, p) => l.ProductId == p.ID)
                 .GroupBy((l, p) => new { p.ID, ShopType = l.ShopType ?? 0 })
@@ -2997,6 +3010,13 @@ public override TestIdAndIdentity Deserialize(object value)
     }
 }
 }
+        public class AppInfoEntity
+        {
+            [Column(IsPrimary = true, Name = "APP_ID")]
+            public string AppID { get; set; }
+            [Column(Name = "APP_NAME")]
+            public string AppName { get; set; }
+        }
 public partial class OrderLine22x
 {
 

FreeSql.DbContext/DbSet/DbSet.cs

@@ -281,8 +281,8 @@ public Dictionary<string, object[]> CompareState(TEntity newdata)
 
             return _db.OrmOriginal.CompareEntityValueReturnColumns(_entityType, oldState.Value, newdata, false).ToDictionary(a => a, a => new object[]
             {
-                _db.OrmOriginal.GetEntityValueWithPropertyName(_entityType, newdata, a),
-                _db.OrmOriginal.GetEntityValueWithPropertyName(_entityType, oldState.Value, a)
+                _db.OrmOriginal.GetEntityValueWithPropertyName(_entityType, newdata, _table.Columns[a].CsName),
+                _db.OrmOriginal.GetEntityValueWithPropertyName(_entityType, oldState.Value, _table.Columns[a].CsName)
             });
         }
 

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -0,0 +1,45 @@
+using FreeSql.DataAnnotations;
+using FreeSql.Internal;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace FreeSql.Tests.DbContext2
+{
+    public class CompareStateTest
+    {
+        [Fact]
+        public void TestCompareState()
+        {
+            using (var fsql = g.CreateMemory())
+            {
+                fsql.Insert(new AppInfoEntity { AppID = "03DN8CW8", AppName = "app_01" }).ExecuteAffrows();
+                var repo = fsql.GetRepository<AppInfoEntity>();
+
+                var appInfo = repo.Where(info => info.AppID == "03DN8CW8").First();
+                appInfo = repo.Where(info => info.AppID == "03DN8CW8").First();
+                var compareDic = new Dictionary<string, object[]>();
+                var updateInfo = "";
+
+                repo.Attach(appInfo);
+                appInfo.AppName = "测试";
+                compareDic = repo.CompareState(appInfo);
+                Console.WriteLine(appInfo.AppName);
+
+            }
+        }
+
+        public class AppInfoEntity
+        {
+            [Column(IsPrimary = true, Name = "APP_ID")]
+            public string AppID { get; set; }
+            [Column(Name = "APP_NAME")]
+            public string AppName { get; set; }
+        }
+
+    }
+}