删除角色权限和用户角色仓储

Admin.Core.Repository/Admin/RolePermission/IRolePermissionRepository.cs

@@ -1,8 +0,0 @@
-using Admin.Core.Model.Admin;
-
-namespace Admin.Core.Repository.Admin
-{
-    public interface IRolePermissionRepository : IRepositoryBase<RolePermissionEntity>
-    {
-    }
-}

Admin.Core.Repository/Admin/RolePermission/RolePermissionRepository.cs

@@ -1,11 +0,0 @@
-using Admin.Core.Model.Admin;
-
-namespace Admin.Core.Repository.Admin
-{
-    public class RolePermissionRepository : RepositoryBase<RolePermissionEntity>, IRolePermissionRepository
-    {
-        public RolePermissionRepository(MyUnitOfWorkManager muowm) : base(muowm)
-        {
-        }
-    }
-}

Admin.Core.Repository/Admin/UserRole/IUserRoleRepository.cs

@@ -1,8 +0,0 @@
-using Admin.Core.Model.Admin;
-
-namespace Admin.Core.Repository.Admin
-{
-    public interface IUserRoleRepository : IRepositoryBase<UserRoleEntity>
-    {
-    }
-}

Admin.Core.Repository/Admin/UserRole/UserRoleRepository.cs

@@ -1,11 +0,0 @@
-using Admin.Core.Model.Admin;
-
-namespace Admin.Core.Repository.Admin
-{
-    public class UserRoleRepository : RepositoryBase<UserRoleEntity>, IUserRoleRepository
-    {
-        public UserRoleRepository(MyUnitOfWorkManager muowm) : base(muowm)
-        {
-        }
-    }
-}

Admin.Core.Service/Admin/Permission/PermissionService.cs

@@ -21,8 +21,7 @@ namespace Admin.Core.Service.Admin.Permission
         private readonly AppConfig _appConfig;
         private readonly IPermissionRepository _permissionRepository;
         private readonly IRoleRepository _roleRepository;
-        private readonly IRolePermissionRepository _rolePermissionRepository;
-        private readonly IUserRepository _userRepository;
+        private readonly IRepositoryBase<RolePermissionEntity> _rolePermissionRepository;
         private readonly IRepositoryBase<TenantPermissionEntity> _tenantPermissionRepository;
         private readonly IRepositoryBase<UserRoleEntity> _userRoleRepository;
         private readonly IRepositoryBase<PermissionApiEntity> _permissionApiRepository;
@@ -31,8 +30,7 @@ namespace Admin.Core.Service.Admin.Permission
             AppConfig appConfig,
             IPermissionRepository permissionRepository,
             IRoleRepository roleRepository,
-            IRolePermissionRepository rolePermissionRepository,
-            IUserRepository userRepository,
+            IRepositoryBase<RolePermissionEntity> rolePermissionRepository,
             IRepositoryBase<TenantPermissionEntity> tenantPermissionRepository,
             IRepositoryBase<UserRoleEntity> userRoleRepository,
             IRepositoryBase<PermissionApiEntity> permissionApiRepository
@@ -42,7 +40,6 @@ namespace Admin.Core.Service.Admin.Permission
             _permissionRepository = permissionRepository;
             _roleRepository = roleRepository;
             _rolePermissionRepository = rolePermissionRepository;
-            _userRepository = userRepository;
             _tenantPermissionRepository = tenantPermissionRepository;
             _userRoleRepository = userRoleRepository;
             _permissionApiRepository = permissionApiRepository;

Admin.Core.Service/Admin/Role/RoleService.cs

@@ -1,6 +1,7 @@
 using Admin.Core.Common.Input;
 using Admin.Core.Common.Output;
 using Admin.Core.Model.Admin;
+using Admin.Core.Repository;
 using Admin.Core.Repository.Admin;
 using Admin.Core.Service.Admin.Role.Input;
 using Admin.Core.Service.Admin.Role.Output;
@@ -12,11 +13,11 @@ namespace Admin.Core.Service.Admin.Role
     public class RoleService : BaseService, IRoleService
     {
         private readonly IRoleRepository _roleRepository;
-        private readonly IRolePermissionRepository _rolePermissionRepository;
+        private readonly IRepositoryBase<RolePermissionEntity> _rolePermissionRepository;
 
         public RoleService(
             IRoleRepository roleRepository,
-            IRolePermissionRepository rolePermissionRepository
+            IRepositoryBase<RolePermissionEntity> rolePermissionRepository
         )
         {
             _roleRepository = roleRepository;

Admin.Core.Service/Admin/Tenant/TenantService.cs

@@ -3,6 +3,7 @@ using Admin.Core.Common.Helpers;
 using Admin.Core.Common.Input;
 using Admin.Core.Common.Output;
 using Admin.Core.Model.Admin;
+using Admin.Core.Repository;
 using Admin.Core.Repository.Admin;
 using Admin.Core.Service.Admin.Tenant.Input;
 using Admin.Core.Service.Admin.Tenant.Output;
@@ -16,15 +17,15 @@ namespace Admin.Core.Service.Admin.Tenant
         private readonly ITenantRepository _tenantRepository;
         private readonly IRoleRepository _roleRepository;
         private readonly IUserRepository _userRepository;
-        private readonly IUserRoleRepository _userRoleRepository;
-        private readonly IRolePermissionRepository _rolePermissionRepository;
+        private readonly IRepositoryBase<UserRoleEntity> _userRoleRepository;
+        private readonly IRepositoryBase<RolePermissionEntity> _rolePermissionRepository;
 
         public TenantService(
             ITenantRepository tenantRepository,
             IRoleRepository roleRepository,
             IUserRepository userRepository,
-            IUserRoleRepository userRoleRepository,
-            IRolePermissionRepository rolePermissionRepository
+            IRepositoryBase<UserRoleEntity> userRoleRepository,
+            IRepositoryBase<RolePermissionEntity> rolePermissionRepository
         )
         {
             _tenantRepository = tenantRepository;

Admin.Core.Service/Admin/User/UserService.cs

@@ -5,6 +5,7 @@ using Admin.Core.Common.Helpers;
 using Admin.Core.Common.Input;
 using Admin.Core.Common.Output;
 using Admin.Core.Model.Admin;
+using Admin.Core.Repository;
 using Admin.Core.Repository.Admin;
 using Admin.Core.Service.Admin.Auth.Output;
 using Admin.Core.Service.Admin.User.Input;
@@ -22,16 +23,14 @@ namespace Admin.Core.Service.Admin.User
     {
         private readonly AppConfig _appConfig;
         private readonly IUserRepository _userRepository;
-        private readonly IUserRoleRepository _userRoleRepository;
-        private readonly IRolePermissionRepository _rolePermissionRepository;
+        private readonly IRepositoryBase<UserRoleEntity> _userRoleRepository;
         private readonly ITenantRepository _tenantRepository;
         private readonly IApiRepository _apiRepository;
 
         public UserService(
             AppConfig appConfig,
             IUserRepository userRepository,
-            IUserRoleRepository userRoleRepository,
-            IRolePermissionRepository rolePermissionRepository,
+            IRepositoryBase<UserRoleEntity> userRoleRepository,
             ITenantRepository tenantRepository,
             IApiRepository apiRepository
         )
@@ -39,7 +38,6 @@ namespace Admin.Core.Service.Admin.User
             _appConfig = appConfig;
             _userRepository = userRepository;
             _userRoleRepository = userRoleRepository;
-            _rolePermissionRepository = rolePermissionRepository;
             _tenantRepository = tenantRepository;
             _apiRepository = apiRepository;
         }
@@ -51,8 +49,11 @@ namespace Admin.Core.Service.Admin.User
             if (_appConfig.Tenant && entityDto?.TenantId.Value > 0)
             {
                 var tenant = await _tenantRepository.Select.DisableGlobalFilter("Tenant").WhereDynamic(entityDto.TenantId).ToOneAsync(a => new { a.TenantType, a.DataIsolationType });
-                output.Data.TenantType = tenant.TenantType;
-                output.Data.DataIsolationType = tenant.DataIsolationType;
+                if(null != tenant)
+                {
+                    output.Data.TenantType = tenant.TenantType;
+                    output.Data.DataIsolationType = tenant.DataIsolationType;
+                }
             }
             return output.Ok(entityDto);
         }