From dbf75535c54eb853378c0074ee6da8cbe12eae9f Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 24 Apr 2025 09:35:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs | 5 +++++ .../BeforeSaveTrigger/UserLogTrigger.cs | 20 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs index e5b2d247a..0b7ed2b8b 100644 --- a/IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs +++ b/IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs @@ -80,8 +80,13 @@ namespace IRaCIS.Core.API triggerOptions.AddTrigger(); triggerOptions.AddTrigger(); + + triggerOptions.AddTrigger(); + + + }); }); diff --git a/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs b/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs index fcc21dc52..ccb21566a 100644 --- a/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs @@ -74,6 +74,26 @@ namespace IRaCIS.Core.Application.Triggers { await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { CheckCode = user.CheckCode }); } + + if (beforeUser.FirstName != user.FirstName || beforeUser.LastName != user.LastName) + { + await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { FirstName = user.FirstName,LastName=user.LastName }); + } + + if (beforeUser.Phone != user.Phone) + { + await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { Phone = user.Phone }); + } + + if (beforeUser.IsZhiZhun != user.IsZhiZhun) + { + await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { IsZhiZhun = user.IsZhiZhun,OrganizationName=user.OrganizationName }); + } + + if (beforeUser.DepartmentName != user.DepartmentName || beforeUser.PositionName != user.PositionName) + { + await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { DepartmentName = user.DepartmentName, PositionName = user.PositionName }); + } } } From 1d2ef4561f9c052444842fa720eb4082401f756f Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 24 Apr 2025 09:42:44 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Triggers/BeforeSaveTrigger/UserLogTrigger.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs b/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs index ccb21566a..65a99963f 100644 --- a/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs @@ -85,6 +85,11 @@ namespace IRaCIS.Core.Application.Triggers await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { Phone = user.Phone }); } + if (beforeUser.Sex != user.Sex) + { + await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { Sex = user.Sex }); + } + if (beforeUser.IsZhiZhun != user.IsZhiZhun) { await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { IsZhiZhun = user.IsZhiZhun,OrganizationName=user.OrganizationName }); @@ -94,6 +99,7 @@ namespace IRaCIS.Core.Application.Triggers { await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { DepartmentName = user.DepartmentName, PositionName = user.PositionName }); } + } } From 0da73ce1dbe82fc5760a430d967a458c71334489 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 24 Apr 2025 09:58:53 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8D=95=E7=8B=AC=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Triggers/BeforeSaveTrigger/UserLogTrigger.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs b/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs index 65a99963f..3ac19080d 100644 --- a/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs @@ -77,7 +77,7 @@ namespace IRaCIS.Core.Application.Triggers if (beforeUser.FirstName != user.FirstName || beforeUser.LastName != user.LastName) { - await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { FirstName = user.FirstName,LastName=user.LastName }); + await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { FirstName = user.FirstName, LastName = user.LastName }); } if (beforeUser.Phone != user.Phone) @@ -92,7 +92,12 @@ namespace IRaCIS.Core.Application.Triggers if (beforeUser.IsZhiZhun != user.IsZhiZhun) { - await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { IsZhiZhun = user.IsZhiZhun,OrganizationName=user.OrganizationName }); + await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { IsZhiZhun = user.IsZhiZhun, OrganizationName = user.OrganizationName }); + } + + if (beforeUser.OrganizationName != user.OrganizationName) + { + await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { OrganizationName = user.OrganizationName }); } if (beforeUser.DepartmentName != user.DepartmentName || beforeUser.PositionName != user.PositionName) From 5c4388a2e78560ae38d47575b4bd4ec6e9593ecc Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 24 Apr 2025 10:40:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Triggers/BeforeSaveTrigger/UserLogTrigger.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs b/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs index 3ac19080d..b91cbb28b 100644 --- a/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs @@ -58,6 +58,13 @@ namespace IRaCIS.Core.Application.Triggers await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { IsFirstAdd = true }); } + + //只用初始化其中一个 + if (beforeUser.IsFirstAdd == true && user.IsFirstAdd == false) + { + + await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { IsFirstAdd = false }); + } if (beforeUser.Password != user.Password) { From daf593f76a1d4dc3510a326c09e7e042b3b5d270 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 24 Apr 2025 11:05:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Triggers/BeforeSaveTrigger/UserLogTrigger.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs b/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs index b91cbb28b..54e3bfbb6 100644 --- a/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs @@ -74,7 +74,7 @@ namespace IRaCIS.Core.Application.Triggers if (beforeUser.EMail != user.EMail) { - await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == user.EMail, u => new User() { EMail = user.EMail }); + await _userReposiotry.BatchUpdateNoTrackingAsync(t => t.EMail == beforeUser.EMail, u => new User() { EMail = user.EMail }); } if (beforeUser.CheckCode != user.CheckCode)