Jelajahi Sumber

1、租户id全局设置 2、vform3降级3.0.8 3、升级nuget包

zuohuaijun 3 tahun lalu
induk
melakukan
4f98bd584a

+ 4 - 4
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -24,9 +24,9 @@
 
   <ItemGroup>
     <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.6.8" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.6.8" />
-    <PackageReference Include="Furion.Pure" Version="4.6.8" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.6.9" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.6.9" />
+    <PackageReference Include="Furion.Pure" Version="4.6.9" />
     <PackageReference Include="Lazy.Captcha.Core" Version="1.1.6" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.6.8" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.6.8" />
@@ -41,7 +41,7 @@
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.20" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
-    <PackageReference Include="Masuit.Tools.Core" Version="2.5.6.2" />
+    <PackageReference Include="Masuit.Tools.Core" Version="2.5.6.3" />
   </ItemGroup>
 
   <ItemGroup>

+ 1 - 5
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -79,11 +79,7 @@ public static class SqlSugarSetup
                         if (App.User != null)
                         {
                             if (entityInfo.PropertyName == "TenantId")
-                            {
-                                var tenantId = ((dynamic)entityInfo.EntityValue).TenantId;
-                                if (tenantId == null || tenantId == 0)
-                                    entityInfo.SetValue(App.User.FindFirst(ClaimConst.TenantId)?.Value);
-                            }
+                                entityInfo.SetValue(App.User.FindFirst(ClaimConst.TenantId)?.Value);
                             if (entityInfo.PropertyName == "CreateUserId")
                                 entityInfo.SetValue(App.User.FindFirst(ClaimConst.UserId)?.Value);
                             if (entityInfo.PropertyName == "CreateOrgId")

+ 1 - 1
Web/package.json

@@ -30,7 +30,7 @@
 		"screenfull": "^6.0.2",
 		"sortablejs": "^1.15.0",
 		"splitpanes": "^3.1.1",
-		"vform3-builds": "^3.0.9",
+		"vform3-builds": "^3.0.8",
 		"vue": "^3.2.37",
 		"vue-clipboard3": "^2.0.0",
 		"vue-grid-layout": "^3.0.0-beta1",