gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🍓 feat(DB-AOP): 添加设置应用Id功能

Browse Source
This commit is contained in:
喵你个汪呀 2025-08-30 00:00:49 +08:00
parent 5a96ecd5ac
commit 4e2b80a261
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Admin.NET/Admin.NET.Core/Const/SqlSugarConst.cs
View File

@ -30,4 +30,9 @@ public class SqlSugarConst
/// 默认租户Id /// 默认租户Id
/// </summary> /// </summary>
public const long DefaultTenantId = 1300000000001; public const long DefaultTenantId = 1300000000001;
/// <summary>
/// 默认应用Id
/// </summary>
public const long DefaultAppId = 1300000000001;
} }

12
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs
View File

@ -244,10 +244,16 @@ public static class SqlSugarSetup
entityInfo.SetValue(DateTime.Now); entityInfo.SetValue(DateTime.Now);
} }
// 若当前用户非空（web线程时） // 若当前用户非空（web线程时）
if (App.User == null) return; if (App.User == null || userManager.Value == null) return;
dynamic entityValue = entityInfo.EntityValue; dynamic entityValue = entityInfo.EntityValue;
if (entityInfo.PropertyName == nameof(EntityTenantId.TenantId)) // 若应用Id为空则赋值当前用户应用Id，若当前用户应用Id为空，则取默认应用Id
if (entityInfo.PropertyName == nameof(IAppIdFilter.AppId) && entityValue is IAppIdFilter)
{
var appId = entityInfo.EntityColumnInfo.PropertyInfo.GetValue(entityInfo.EntityValue)!;
if (appId == null || appId.Equals(0)) entityInfo.SetValue(userManager.Value?.AppId ?? SqlSugarConst.DefaultAppId);
}
else if (entityInfo.PropertyName == nameof(EntityTenantId.TenantId))
{ {
if (entityValue.TenantId == null || entityValue.TenantId == 0) if (entityValue.TenantId == null || entityValue.TenantId == 0)
entityInfo.SetValue(userManager.Value.TenantId?.ToString() ?? SqlSugarConst.DefaultTenantId.ToString()); entityInfo.SetValue(userManager.Value.TenantId?.ToString() ?? SqlSugarConst.DefaultTenantId.ToString());
@ -255,7 +261,7 @@ public static class SqlSugarSetup
else if (entityInfo.PropertyName == nameof(EntityBase.CreateUserId)) else if (entityInfo.PropertyName == nameof(EntityBase.CreateUserId))
{ {
if (entityValue.CreateUserId == null || entityValue.CreateUserId == 0) if (entityValue.CreateUserId == null || entityValue.CreateUserId == 0)
entityInfo.SetValue(App.User.FindFirst(ClaimConst.UserId)?.Value); entityInfo.SetValue(userManager.Value.UserId);
} }
else if (entityInfo.PropertyName == nameof(EntityBase.CreateUserName)) else if (entityInfo.PropertyName == nameof(EntityBase.CreateUserName))
{ {