😁升级SqlSugar v5.1.4.60及其他优化

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -34,7 +34,7 @@
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.25.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.16.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.59" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.60" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.1" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

Admin.NET/Admin.NET.Core/Service/DataBase/SysDatabaseService.cs

@@ -197,7 +197,7 @@ public class SysDatabaseService : IDynamicApiController, ITransient
         var config = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault(u => u.ConfigId == input.ConfigId);
         input.Position = string.IsNullOrWhiteSpace(input.Position) ? "Admin.NET.Application" : input.Position;
         input.EntityName = string.IsNullOrWhiteSpace(input.EntityName) ? (config.EnableUnderLine ? CodeGenUtil.CamelColumnName(input.TableName, null) : input.TableName) : input.EntityName;
-        
+
         string[] dbColumnNames;//= _codeGenOptions.EntityBaseColumn[input.BaseClassName];
         _codeGenOptions.EntityBaseColumn.TryGetValue(input.BaseClassName, out dbColumnNames);
         if (dbColumnNames is null || dbColumnNames is { Length: 0 })

Admin.NET/Admin.NET.Core/Service/User/SysUserRoleService.cs

@@ -61,7 +61,7 @@ public class SysUserRoleService : ITransient
         var sysUserRoleList = await _sysUserRoleRep.AsQueryable()
             .Mapper(u => u.SysRole, u => u.RoleId)
             .Where(u => u.UserId == userId).ToListAsync();
-        return sysUserRoleList.Select(u => u.SysRole).ToList();
+        return sysUserRoleList.Where(u => u.SysRole != null).Select(u => u.SysRole).ToList();
     }
 
     /// <summary>

Admin.NET/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj

@@ -30,10 +30,6 @@
 	  <EmbeddedResource Include="sensitive-words.txt" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\Admin.NET.Web.Core\Admin.NET.Web.Core.csproj" />
 	</ItemGroup>