修复已知问题

src/platform/ZhonTai.Admin/Core/Auth/IUser.cs

@@ -1,6 +1,5 @@
-
-using ZhonTai.Admin.Core.Entities;
-using ZhonTai.Admin.Domain.Role;
+using ZhonTai.Admin.Domain.Role;
+using ZhonTai.Admin.Domain.Tenant;
 using ZhonTai.Admin.Domain.User;
 using ZhonTai.Admin.Domain.User.Dto;
 

src/platform/ZhonTai.Admin/Core/Auth/User.cs

@@ -1,13 +1,13 @@
 using Microsoft.AspNetCore.Http;
 using System;
 using ZhonTai.Common.Extensions;
-using ZhonTai.Admin.Core.Entities;
 using ZhonTai.Admin.Domain.User;
 using Microsoft.Extensions.DependencyInjection;
 using ZhonTai.Admin.Domain.User.Dto;
 using ZhonTai.Admin.Core.Consts;
 using ZhonTai.Admin.Tools.Cache;
 using ZhonTai.Admin.Services.User;
+using ZhonTai.Admin.Domain.Tenant;
 
 namespace ZhonTai.Admin.Core.Auth;
 

src/platform/ZhonTai.Admin/Domain/Role/RoleEntity.cs

@@ -28,8 +28,11 @@ public partial class RoleEntity : EntityBase, ITenant
     /// </summary>
     public long ParentId { get; set; }
 
+    /// <summary>
+    /// 子级列表
+    /// </summary>
     [Navigate(nameof(ParentId))]
-    public List<OrgEntity> Childs { get; set; }
+    public List<RoleEntity> Childs { get; set; }
 
     /// <summary>
     /// 名称

src/platform/ZhonTai.Admin/Domain/Tenant/TenantEntity.cs

@@ -54,7 +54,7 @@ public partial class TenantEntity : EntityBase
     /// <summary>
     /// 租户类型
     /// </summary>
-    public TenantType? TenantType { get; set; } = Core.Entities.TenantType.Tenant;
+    public TenantType? TenantType { get; set; } = Tenant.TenantType.Tenant;
 
     /// <summary>
     /// 数据库注册键

src/platform/ZhonTai.Admin/Core/Entities/TenantType.cs → src/platform/ZhonTai.Admin/Domain/Tenant/TenantType.cs

@@ -1,4 +1,4 @@
-namespace ZhonTai.Admin.Core.Entities;
+namespace ZhonTai.Admin.Domain.Tenant;
 
 /// <summary>
 /// 租户类型

src/platform/ZhonTai.Admin/Services/Auth/Dto/AuthLoginOutput.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Domain.Tenant;
 using ZhonTai.Admin.Domain.User;
 
 namespace ZhonTai.Admin.Services.Auth.Dto;

src/platform/ZhonTai.Admin/Services/Permission/PermissionService.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using ZhonTai.Admin.Core.Attributes;
-using ZhonTai.Admin.Core.Entities;
 using ZhonTai.Admin.Core.Configs;
 using ZhonTai.Admin.Core.Dto;
 using ZhonTai.Admin.Core.Repositories;
@@ -22,6 +21,7 @@ using ZhonTai.DynamicApi.Attributes;
 using ZhonTai.Admin.Core.Db;
 using ZhonTai.Admin.Core.Consts;
 using FreeSql;
+using ZhonTai.Admin.Domain.Tenant;
 
 namespace ZhonTai.Admin.Services.Permission;
 

src/platform/ZhonTai.Admin/Services/Role/RoleService.cs

@@ -124,7 +124,11 @@ public class RoleService : BaseService, IRoleService, IDynamicApi
         var insertUserIds = input.UserIds.Except(userIds);
         if (insertUserIds != null && insertUserIds.Any())
         {
-            var userRoleList = insertUserIds.Select(userId => new UserRoleEntity { UserId = userId, RoleId = roleId });
+            var userRoleList = insertUserIds.Select(userId => new UserRoleEntity 
+            { 
+                UserId = userId, 
+                RoleId = roleId 
+            }).ToList();
             await _userRoleRepository.InsertAsync(userRoleList);
         }
 
@@ -152,7 +156,11 @@ public class RoleService : BaseService, IRoleService, IDynamicApi
     {
         if (orgIds != null && orgIds.Any())
         {
-            var roleOrgs = orgIds.Select(orgId => new RoleOrgEntity { RoleId = roleId, OrgId = orgId }).ToList();
+            var roleOrgs = orgIds.Select(orgId => new RoleOrgEntity 
+            { 
+                RoleId = roleId, 
+                OrgId = orgId 
+            }).ToList();
             await _roleOrgRepository.InsertAsync(roleOrgs);
         }
     }

src/platform/ZhonTai.Admin/ZhonTai.Admin.csproj

@@ -30,7 +30,7 @@
 		<PackageReference Include="NLog.Web.AspNetCore" Version="5.1.4" />
 		<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
 		<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta14" />
-		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.23.1" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.24.0" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
 		<PackageReference Include="UAParser" Version="3.1.47" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -1317,21 +1317,6 @@
             数据版本
             </summary>
         </member>
-        <member name="T:ZhonTai.Admin.Core.Entities.TenantType">
-            <summary>
-            租户类型
-            </summary>
-        </member>
-        <member name="F:ZhonTai.Admin.Core.Entities.TenantType.Platform">
-            <summary>
-            平台
-            </summary>
-        </member>
-        <member name="F:ZhonTai.Admin.Core.Entities.TenantType.Tenant">
-            <summary>
-            租户
-            </summary>
-        </member>
         <member name="T:ZhonTai.Admin.Core.Enums.ApiVersion">
             <summary>
             接口版本
@@ -2650,6 +2635,21 @@
             说明
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Domain.Tenant.TenantType">
+            <summary>
+            租户类型
+            </summary>
+        </member>
+        <member name="F:ZhonTai.Admin.Domain.Tenant.TenantType.Platform">
+            <summary>
+            平台
+            </summary>
+        </member>
+        <member name="F:ZhonTai.Admin.Domain.Tenant.TenantType.Tenant">
+            <summary>
+            租户
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Domain.UserOrgEntity">
             <summary>
             用户所属部门