Эх сурвалжийг харах

fix:修复租户菜单表数据唯一异常问题

喵你个旺呀 1 жил өмнө
parent
commit
c541d0cc96

+ 0 - 1
Admin.NET/Admin.NET.Core/Entity/SysTenantMenu.cs

@@ -11,7 +11,6 @@ namespace Admin.NET.Core;
 /// </summary>
 [SysTable]
 [SugarTable(null, "系统租户菜单表")]
-[SugarIndex("index_{table}_TM", nameof(TenantId), OrderByType.Asc, nameof(MenuId), OrderByType.Asc, IsUnique = true)]
 public class SysTenantMenu : EntityBaseId
 {
     /// <summary>

+ 1 - 1
Admin.NET/Admin.NET.Core/SeedData/SysTenantMenuSeedData.cs

@@ -21,7 +21,7 @@ public class SysTenantMenuSeedData : ISqlSugarEntitySeedData<SysTenantMenu>
         return App.GetService<SysTenantService>().GetTenantDefaultMenuList()
             .Select(u => new SysTenantMenu
             {
-                Id = u.MenuId + (SqlSugarConst.DefaultTenantId % 1300000000000),
+                Id = CommonUtil.GetFixedHashCode("" + SqlSugarConst.DefaultTenantId + u.MenuId, 1300000000000),
                 TenantId = SqlSugarConst.DefaultTenantId,
                 MenuId = u.MenuId
             });

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -326,7 +326,7 @@ public class SysTenantService : IDynamicApiController, ITransient
 
         return menuList.Select(u => new SysTenantMenu
         {
-            Id = u.Id + (SqlSugarConst.DefaultTenantId % 1300000000000),
+            Id = CommonUtil.GetFixedHashCode("" + SqlSugarConst.DefaultTenantId + u.Id, 1300000000000),
             TenantId = SqlSugarConst.DefaultTenantId,
             MenuId = u.Id
         });

+ 5 - 1
Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/SeedData/SysTenantMenuSeedData.cs

@@ -18,6 +18,10 @@ public class SysTenantMenuSeedData : ISqlSugarEntitySeedData<SysTenantMenu>
     /// <returns></returns>
     public IEnumerable<SysTenantMenu> HasData()
     {
-        return new SysMenuSeedData().HasData().Select(u => new SysTenantMenu { Id = u.Id + (SqlSugarConst.DefaultTenantId % 1300000000000), TenantId = SqlSugarConst.DefaultTenantId, MenuId = u.Id });
+        return new SysMenuSeedData().HasData().Select(u => new SysTenantMenu
+        {
+            Id = CommonUtil.GetFixedHashCode("" + SqlSugarConst.DefaultTenantId + u.Id, 1300000000000),
+            TenantId = SqlSugarConst.DefaultTenantId, MenuId = u.Id
+        });
     }
 }