Merge pull request #5206 from zyhfish/task/fix-5205

Fix #5205: specific the date time as UTC kind.
This commit is contained in:
Shaun Walker 2025-03-31 08:40:28 -04:00 committed by GitHub
commit 157322441d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -61,6 +61,9 @@ namespace Oqtane.Repository
public UserRole AddUserRole(UserRole userRole) public UserRole AddUserRole(UserRole userRole)
{ {
userRole.EffectiveDate = userRole.EffectiveDate.HasValue ? DateTime.SpecifyKind(userRole.EffectiveDate.Value, DateTimeKind.Utc) : userRole.EffectiveDate;
userRole.ExpiryDate = userRole.ExpiryDate.HasValue ? DateTime.SpecifyKind(userRole.ExpiryDate.Value, DateTimeKind.Utc) : userRole.ExpiryDate;
using var db = _dbContextFactory.CreateDbContext(); using var db = _dbContextFactory.CreateDbContext();
db.UserRole.Add(userRole); db.UserRole.Add(userRole);
db.SaveChanges(); db.SaveChanges();
@ -84,6 +87,9 @@ namespace Oqtane.Repository
public UserRole UpdateUserRole(UserRole userRole) public UserRole UpdateUserRole(UserRole userRole)
{ {
userRole.EffectiveDate = userRole.EffectiveDate.HasValue ? DateTime.SpecifyKind(userRole.EffectiveDate.Value, DateTimeKind.Utc) : userRole.EffectiveDate;
userRole.ExpiryDate = userRole.ExpiryDate.HasValue ? DateTime.SpecifyKind(userRole.ExpiryDate.Value, DateTimeKind.Utc) : userRole.ExpiryDate;
using var db = _dbContextFactory.CreateDbContext(); using var db = _dbContextFactory.CreateDbContext();
db.Entry(userRole).State = EntityState.Modified; db.Entry(userRole).State = EntityState.Modified;
db.SaveChanges(); db.SaveChanges();