Просмотр исходного кода

😁1、修复菜单更新逻辑 2、升级nuget包(sqlsugar适配furion定时任务)

zuohuaijun 3 лет назад
Родитель
Сommit
e0f04c8e62

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

@@ -14,12 +14,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.17.1" />
+    <PackageReference Include="AngleSharp" Version="1.0.0-ci-228" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="DotNetCore.Natasha.CSharp" Version="5.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.4.9" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.4.9" />
-    <PackageReference Include="Furion.Pure" Version="4.8.4.9" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.4.11" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.4.11" />
+    <PackageReference Include="Furion.Pure" Version="4.8.4.11" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.0" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.2" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.4.2" />
@@ -30,7 +30,7 @@
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.21.1" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.15.2" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.3.43" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.3.44-preview03" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.24" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs

@@ -124,8 +124,8 @@ public class SysMenuService : IDynamicApiController, ITransient
     public async Task UpdateMenu(UpdateMenuInput input)
     {
         var isExist = input.Type != MenuTypeEnum.Btn
-            ? await _sysMenuRep.IsAnyAsync(u => u.Title == input.Title && u.Id != input.Id)
-            : await _sysMenuRep.IsAnyAsync(u => u.Permission == input.Permission && u.Id != input.Id);
+            ? await _sysMenuRep.IsAnyAsync(u => u.Title == input.Title && u.Type == input.Type && u.Id != input.Id)
+            : await _sysMenuRep.IsAnyAsync(u => u.Permission == input.Permission && u.Type == input.Type && u.Id != input.Id);
         if (isExist)
             throw Oops.Oh(ErrorCodeEnum.D4000);