|
|
@@ -18,6 +18,13 @@ using ZhonTai.Admin.Core.Configs;
|
|
|
using ZhonTai.Admin.Domain.Org;
|
|
|
using ZhonTai.Admin.Domain.UserStaff;
|
|
|
using ZhonTai.Admin.Domain.UserOrg;
|
|
|
+using Microsoft.AspNetCore.Identity;
|
|
|
+using System.Linq.Expressions;
|
|
|
+using System;
|
|
|
+using System.Collections.Generic;
|
|
|
+using System.Security.Policy;
|
|
|
+using System.Xml.Linq;
|
|
|
+using Yitter.IdGenerator;
|
|
|
|
|
|
namespace ZhonTai.Admin.Services.Tenant;
|
|
|
|
|
|
@@ -37,6 +44,7 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
|
|
|
private IRolePermissionRepository _rolePermissionRepository => LazyGetRequiredService<IRolePermissionRepository>();
|
|
|
private IUserStaffRepository _userStaffRepository => LazyGetRequiredService<IUserStaffRepository>();
|
|
|
private IUserOrgRepository _userOrgRepository => LazyGetRequiredService<IUserOrgRepository>();
|
|
|
+ private IPasswordHasher<UserEntity> _passwordHasher => LazyGetRequiredService<IPasswordHasher<UserEntity>>();
|
|
|
|
|
|
public TenantService()
|
|
|
{
|
|
|
@@ -49,8 +57,21 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
|
|
|
/// <returns></returns>
|
|
|
public async Task<TenantGetOutput> GetAsync(long id)
|
|
|
{
|
|
|
- var result = await _tenantRepository.GetAsync<TenantGetOutput>(id);
|
|
|
- return result;
|
|
|
+ using (_tenantRepository.DataFilter.Disable(FilterNames.Tenant))
|
|
|
+ {
|
|
|
+ var tenant = await _tenantRepository.Select
|
|
|
+ .WhereDynamic(id)
|
|
|
+ .FirstAsync(a => new TenantGetOutput
|
|
|
+ {
|
|
|
+ Name = a.Org.Name,
|
|
|
+ Code = a.Org.Code,
|
|
|
+ UserName = a.User.UserName,
|
|
|
+ RealName = a.User.Name,
|
|
|
+ Phone = a.User.Mobile,
|
|
|
+ Email = a.User.Email,
|
|
|
+ });
|
|
|
+ return tenant;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -61,23 +82,34 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
|
|
|
[HttpPost]
|
|
|
public async Task<PageOutput<TenantListOutput>> GetPageAsync(PageInput<TenantGetPageDto> input)
|
|
|
{
|
|
|
- var key = input.Filter?.Name;
|
|
|
-
|
|
|
- var list = await _tenantRepository.Select
|
|
|
- .WhereDynamicFilter(input.DynamicFilter)
|
|
|
- .WhereIf(key.NotNull(), a => a.Name.Contains(key))
|
|
|
- .Count(out var total)
|
|
|
- .OrderByDescending(true, c => c.Id)
|
|
|
- .Page(input.CurrentPage, input.PageSize)
|
|
|
- .ToListAsync<TenantListOutput>();
|
|
|
-
|
|
|
- var data = new PageOutput<TenantListOutput>()
|
|
|
+ using (_tenantRepository.DataFilter.Disable(FilterNames.Tenant))
|
|
|
{
|
|
|
- List = list,
|
|
|
- Total = total
|
|
|
- };
|
|
|
-
|
|
|
- return data;
|
|
|
+ var key = input.Filter?.Name;
|
|
|
+
|
|
|
+ var list = await _tenantRepository.Select
|
|
|
+ .WhereDynamicFilter(input.DynamicFilter)
|
|
|
+ .WhereIf(key.NotNull(), a => a.Org.Name.Contains(key))
|
|
|
+ .Count(out var total)
|
|
|
+ .OrderByDescending(true, a => a.Id)
|
|
|
+ .Page(input.CurrentPage, input.PageSize)
|
|
|
+ .ToListAsync(a => new TenantListOutput
|
|
|
+ {
|
|
|
+ Name = a.Org.Name,
|
|
|
+ Code = a.Org.Code,
|
|
|
+ UserName = a.User.UserName,
|
|
|
+ RealName = a.User.Name,
|
|
|
+ Phone = a.User.Mobile,
|
|
|
+ Email = a.User.Email,
|
|
|
+ });
|
|
|
+
|
|
|
+ var data = new PageOutput<TenantListOutput>()
|
|
|
+ {
|
|
|
+ List = list,
|
|
|
+ Total = total
|
|
|
+ };
|
|
|
+
|
|
|
+ return data;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -88,104 +120,172 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
|
|
|
[AdminTransaction]
|
|
|
public virtual async Task<long> AddAsync(TenantAddInput input)
|
|
|
{
|
|
|
- if (await _tenantRepository.Select.AnyAsync(a => a.Name == input.Name))
|
|
|
+ using (_tenantRepository.DataFilter.Disable(FilterNames.Tenant))
|
|
|
{
|
|
|
- throw ResultOutput.Exception($"企业名称已存在");
|
|
|
+ var existsOrg = await _orgRepository.Select
|
|
|
+ .Where(a => (a.Name == input.Name || a.Code == input.Code) && a.ParentId == 0)
|
|
|
+ .FirstAsync(a => new { a.Name, a.Code });
|
|
|
+
|
|
|
+ if (existsOrg != null)
|
|
|
+ {
|
|
|
+ if (existsOrg.Name == input.Name)
|
|
|
+ {
|
|
|
+ throw ResultOutput.Exception($"企业名称已存在");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (existsOrg.Code == input.Code)
|
|
|
+ {
|
|
|
+ throw ResultOutput.Exception($"企业编码已存在");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ Expression<Func<UserEntity, bool>> where = (a => a.UserName == input.UserName);
|
|
|
+ where = where.Or(input.Phone.NotNull(), a => a.Mobile == input.Phone)
|
|
|
+ .Or(input.Email.NotNull(), a => a.Email == input.Email);
|
|
|
+
|
|
|
+ var existsUser = await _userRepository.Select.Where(where)
|
|
|
+ .FirstAsync(a => new { a.UserName, a.Mobile, a.Email });
|
|
|
+
|
|
|
+ if (existsUser != null)
|
|
|
+ {
|
|
|
+ if (existsUser.UserName == input.UserName)
|
|
|
+ {
|
|
|
+ throw ResultOutput.Exception($"企业账号已存在");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (input.Phone.NotNull() && existsUser.Mobile == input.Phone)
|
|
|
+ {
|
|
|
+ throw ResultOutput.Exception($"企业手机号已存在");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (input.Email.NotNull() && existsUser.Email == input.Email)
|
|
|
+ {
|
|
|
+ throw ResultOutput.Exception($"企业邮箱已存在");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //添加租户
|
|
|
+ TenantEntity entity = Mapper.Map<TenantEntity>(input);
|
|
|
+ TenantEntity tenant = await _tenantRepository.InsertAsync(entity);
|
|
|
+ long tenantId = tenant.Id;
|
|
|
+
|
|
|
+ //添加部门
|
|
|
+ var org = new OrgEntity
|
|
|
+ {
|
|
|
+ TenantId = tenantId,
|
|
|
+ Name = input.Name,
|
|
|
+ Code = input.Code,
|
|
|
+ ParentId = 0,
|
|
|
+ MemberCount = 1,
|
|
|
+ Sort = 1,
|
|
|
+ Enabled = true
|
|
|
+ };
|
|
|
+ await _orgRepository.InsertAsync(org);
|
|
|
+
|
|
|
+ //添加用户
|
|
|
+ var user = new UserEntity
|
|
|
+ {
|
|
|
+ TenantId = tenantId,
|
|
|
+ UserName = input.UserName,
|
|
|
+ Name = input.RealName,
|
|
|
+ Mobile = input.Phone,
|
|
|
+ Email = input.Email,
|
|
|
+ Type = UserType.TenantAdmin,
|
|
|
+ OrgId = org.Id,
|
|
|
+ Enabled = true
|
|
|
+ };
|
|
|
+ if (_appConfig.PasswordHasher)
|
|
|
+ {
|
|
|
+ user.Password = _passwordHasher.HashPassword(user, _appConfig.DefaultPassword);
|
|
|
+ user.PasswordEncryptType = PasswordEncryptType.PasswordHasher;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ user.Password = MD5Encrypt.Encrypt32(_appConfig.DefaultPassword);
|
|
|
+ user.PasswordEncryptType = PasswordEncryptType.MD5Encrypt32;
|
|
|
+ }
|
|
|
+ await _userRepository.InsertAsync(user);
|
|
|
+
|
|
|
+ long userId = user.Id;
|
|
|
+
|
|
|
+ //添加用户员工
|
|
|
+ var emp = new UserStaffEntity
|
|
|
+ {
|
|
|
+ Id = userId,
|
|
|
+ TenantId = tenantId
|
|
|
+ };
|
|
|
+ await _userStaffRepository.InsertAsync(emp);
|
|
|
+
|
|
|
+ //添加用户部门
|
|
|
+ var userOrg = new UserOrgEntity
|
|
|
+ {
|
|
|
+ UserId = userId,
|
|
|
+ OrgId = org.Id
|
|
|
+ };
|
|
|
+ await _userOrgRepository.InsertAsync(userOrg);
|
|
|
+
|
|
|
+ //添加角色分组和角色
|
|
|
+ var roleGroupId = YitIdHelper.NextId();
|
|
|
+ var roleId = YitIdHelper.NextId();
|
|
|
+ var jobGroupId = YitIdHelper.NextId();
|
|
|
+ var roles = new List<RoleEntity>{
|
|
|
+ new RoleEntity
|
|
|
+ {
|
|
|
+ Id = roleGroupId,
|
|
|
+ ParentId = 0,
|
|
|
+ TenantId = tenantId,
|
|
|
+ Type = RoleType.Group,
|
|
|
+ Name = "系统默认",
|
|
|
+ Sort = 1
|
|
|
+ },
|
|
|
+ new RoleEntity
|
|
|
+ {
|
|
|
+ Id = roleId,
|
|
|
+ TenantId = tenantId,
|
|
|
+ Type = RoleType.Role,
|
|
|
+ Name = "主管理员",
|
|
|
+ Code = "main-admin",
|
|
|
+ ParentId = roleGroupId,
|
|
|
+ DataScope = DataScope.All,
|
|
|
+ Sort = 1
|
|
|
+ },
|
|
|
+ new RoleEntity
|
|
|
+ {
|
|
|
+ Id= jobGroupId,
|
|
|
+ ParentId = 0,
|
|
|
+ TenantId = tenantId,
|
|
|
+ Type = RoleType.Group,
|
|
|
+ Name = "岗位",
|
|
|
+ Sort = 2
|
|
|
+ },
|
|
|
+ new RoleEntity
|
|
|
+ {
|
|
|
+ TenantId = tenantId,
|
|
|
+ Type = RoleType.Role,
|
|
|
+ Name = "普通员工",
|
|
|
+ Code = "emp",
|
|
|
+ ParentId = jobGroupId,
|
|
|
+ DataScope = DataScope.All,
|
|
|
+ Sort = 2
|
|
|
+ }
|
|
|
+ };
|
|
|
+ await _roleRepository.InsertAsync(roles);
|
|
|
+
|
|
|
+ //添加用户角色
|
|
|
+ var userRole = new UserRoleEntity()
|
|
|
+ {
|
|
|
+ UserId = userId,
|
|
|
+ RoleId = roleId
|
|
|
+ };
|
|
|
+ await _userRoleRepository.InsertAsync(userRole);
|
|
|
+
|
|
|
+ //更新租户的用户和部门
|
|
|
+ tenant.UserId = userId;
|
|
|
+ tenant.OrgId = org.Id;
|
|
|
+ await _tenantRepository.UpdateAsync(tenant);
|
|
|
+
|
|
|
+ return tenant.Id;
|
|
|
}
|
|
|
-
|
|
|
- if (await _tenantRepository.Select.AnyAsync(a => a.Code == input.Code))
|
|
|
- {
|
|
|
- throw ResultOutput.Exception($"企业编码已存在");
|
|
|
- }
|
|
|
-
|
|
|
- //添加租户
|
|
|
- TenantEntity entity = Mapper.Map<TenantEntity>(input);
|
|
|
- TenantEntity tenant = await _tenantRepository.InsertAsync(entity);
|
|
|
- long tenantId = tenant.Id;
|
|
|
-
|
|
|
- //添加部门
|
|
|
- var org = new OrgEntity
|
|
|
- {
|
|
|
- TenantId = tenantId,
|
|
|
- Name = input.Name,
|
|
|
- Code = input.Code,
|
|
|
- ParentId = 0,
|
|
|
- MemberCount = 1,
|
|
|
- Sort = 1
|
|
|
- };
|
|
|
- await _orgRepository.InsertAsync(org);
|
|
|
-
|
|
|
- //添加主管理员
|
|
|
- string pwd = MD5Encrypt.Encrypt32(_appConfig.DefaultPassword);
|
|
|
- var user = new UserEntity
|
|
|
- {
|
|
|
- TenantId = tenantId,
|
|
|
- UserName = input.Phone,
|
|
|
- Password = pwd,
|
|
|
- Name = input.RealName,
|
|
|
- Mobile = input.Phone,
|
|
|
- Email = input.Email,
|
|
|
- Enabled = true,
|
|
|
- Type = UserType.TenantAdmin,
|
|
|
- OrgId = org.Id
|
|
|
- };
|
|
|
- await _userRepository.InsertAsync(user);
|
|
|
-
|
|
|
- long userId = user.Id;
|
|
|
-
|
|
|
- //添加员工
|
|
|
- var emp = new UserStaffEntity
|
|
|
- {
|
|
|
- Id = userId,
|
|
|
- TenantId = tenantId
|
|
|
- };
|
|
|
- await _userStaffRepository.InsertAsync(emp);
|
|
|
-
|
|
|
- //添加用户部门
|
|
|
- var userOrg = new UserOrgEntity
|
|
|
- {
|
|
|
- UserId = userId,
|
|
|
- OrgId = org.Id
|
|
|
- };
|
|
|
- await _userOrgRepository.InsertAsync(userOrg);
|
|
|
-
|
|
|
- //添加角色分组
|
|
|
- var roleGroup = new RoleEntity
|
|
|
- {
|
|
|
- ParentId = 0,
|
|
|
- TenantId = tenantId,
|
|
|
- Type = RoleType.Group,
|
|
|
- Name = "系统默认",
|
|
|
- Sort = 1
|
|
|
- };
|
|
|
- await _roleRepository.InsertAsync(roleGroup);
|
|
|
-
|
|
|
- //添加角色
|
|
|
- var role = new RoleEntity
|
|
|
- {
|
|
|
- TenantId = tenantId,
|
|
|
- Type = RoleType.Role,
|
|
|
- Name = "主管理员",
|
|
|
- Code = "main-admin",
|
|
|
- ParentId = roleGroup.Id,
|
|
|
- DataScope = DataScope.All,
|
|
|
- Sort = 1
|
|
|
- };
|
|
|
- await _roleRepository.InsertAsync(role);
|
|
|
-
|
|
|
- //添加用户角色
|
|
|
- var userRole = new UserRoleEntity()
|
|
|
- {
|
|
|
- UserId = userId,
|
|
|
- RoleId = role.Id
|
|
|
- };
|
|
|
- await _userRoleRepository.InsertAsync(userRole);
|
|
|
-
|
|
|
- //更新租户的用户
|
|
|
- tenant.UserId = userId;
|
|
|
- await _tenantRepository.UpdateAsync(tenant);
|
|
|
-
|
|
|
- return tenant.Id;
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -195,24 +295,87 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
|
|
|
/// <returns></returns>
|
|
|
public async Task UpdateAsync(TenantUpdateInput input)
|
|
|
{
|
|
|
- if (await _tenantRepository.Select.AnyAsync(a => a.Id != input.Id && a.Name == input.Name))
|
|
|
- {
|
|
|
- throw ResultOutput.Exception($"企业名称已存在");
|
|
|
- }
|
|
|
-
|
|
|
- if (await _tenantRepository.Select.AnyAsync(a => a.Id != input.Id && a.Code == input.Code))
|
|
|
+ using (_tenantRepository.DataFilter.Disable(FilterNames.Tenant))
|
|
|
{
|
|
|
- throw ResultOutput.Exception($"企业编码已存在");
|
|
|
+ var tenant = await _tenantRepository.GetAsync(input.Id);
|
|
|
+ if (!(tenant?.Id > 0))
|
|
|
+ {
|
|
|
+ throw ResultOutput.Exception("租户不存在");
|
|
|
+ }
|
|
|
+
|
|
|
+ var existsOrg = await _orgRepository.Select
|
|
|
+ .Where(a => a.Id != tenant.OrgId && (a.Name == input.Name || a.Code == input.Code))
|
|
|
+ .FirstAsync(a => new { a.Name, a.Code });
|
|
|
+
|
|
|
+ if (existsOrg != null)
|
|
|
+ {
|
|
|
+ if (existsOrg.Name == input.Name)
|
|
|
+ {
|
|
|
+ throw ResultOutput.Exception($"企业名称已存在");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (existsOrg.Code == input.Code)
|
|
|
+ {
|
|
|
+ throw ResultOutput.Exception($"企业编码已存在");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ Expression<Func<UserEntity, bool>> where = (a => a.UserName == input.UserName);
|
|
|
+ where = where.Or(input.Phone.NotNull(), a => a.Mobile == input.Phone)
|
|
|
+ .Or(input.Email.NotNull(), a => a.Email == input.Email);
|
|
|
+
|
|
|
+ var existsUser = await _userRepository.Select.Where(a => a.Id != tenant.UserId).Where(where)
|
|
|
+ .FirstAsync(a => new { a.Id, a.Name, a.UserName, a.Mobile, a.Email });
|
|
|
+
|
|
|
+ if (existsUser != null)
|
|
|
+ {
|
|
|
+ if (existsUser.UserName == input.UserName)
|
|
|
+ {
|
|
|
+ throw ResultOutput.Exception($"企业账号已存在");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (input.Phone.NotNull() && existsUser.Mobile == input.Phone)
|
|
|
+ {
|
|
|
+ throw ResultOutput.Exception($"企业手机号已存在");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (input.Email.NotNull() && existsUser.Email == input.Email)
|
|
|
+ {
|
|
|
+ throw ResultOutput.Exception($"企业邮箱已存在");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //更新用户
|
|
|
+ await _userRepository.UpdateDiy.DisableGlobalFilter(FilterNames.Tenant).SetSource(
|
|
|
+ new UserEntity()
|
|
|
+ {
|
|
|
+ Id = tenant.UserId,
|
|
|
+ Name = input.RealName,
|
|
|
+ UserName = input.UserName,
|
|
|
+ Mobile = input.Phone,
|
|
|
+ Email = input.Email
|
|
|
+ })
|
|
|
+ .UpdateColumns(a => new { a.Name, a.UserName, a.Mobile, a.Email, a.ModifiedTime }).ExecuteAffrowsAsync();
|
|
|
+
|
|
|
+ //更新部门
|
|
|
+ await _orgRepository.UpdateDiy.DisableGlobalFilter(FilterNames.Tenant).SetSource(
|
|
|
+ new OrgEntity()
|
|
|
+ {
|
|
|
+ Id = tenant.OrgId,
|
|
|
+ Name = input.Name,
|
|
|
+ Code = input.Code
|
|
|
+ })
|
|
|
+ .UpdateColumns(a => new { a.Name, a.Code, a.ModifiedTime }).ExecuteAffrowsAsync();
|
|
|
+
|
|
|
+ //更新租户
|
|
|
+ await _tenantRepository.UpdateDiy.DisableGlobalFilter(FilterNames.Tenant).SetSource(
|
|
|
+ new TenantEntity()
|
|
|
+ {
|
|
|
+ Id = tenant.Id,
|
|
|
+ Description = input.Description,
|
|
|
+ })
|
|
|
+ .UpdateColumns(a => new { a.Description, a.ModifiedTime }).ExecuteAffrowsAsync();
|
|
|
}
|
|
|
-
|
|
|
- var entity = await _tenantRepository.GetAsync(input.Id);
|
|
|
- if (!(entity?.Id > 0))
|
|
|
- {
|
|
|
- throw ResultOutput.Exception("租户不存在");
|
|
|
- }
|
|
|
-
|
|
|
- Mapper.Map(input, entity);
|
|
|
- await _tenantRepository.UpdateAsync(entity);
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -223,32 +386,38 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
|
|
|
[AdminTransaction]
|
|
|
public virtual async Task DeleteAsync(long id)
|
|
|
{
|
|
|
- var tenantType = await _tenantRepository.Select.WhereDynamic(id).ToOneAsync(a => a.TenantType);
|
|
|
- if(tenantType == TenantType.Platform)
|
|
|
+ using (_tenantRepository.DataFilter.Disable(FilterNames.Tenant))
|
|
|
{
|
|
|
- throw ResultOutput.Exception("平台租户禁止删除");
|
|
|
- }
|
|
|
+ var tenantType = await _tenantRepository.Select.WhereDynamic(id).ToOneAsync(a => a.TenantType);
|
|
|
+ if (tenantType == TenantType.Platform)
|
|
|
+ {
|
|
|
+ throw ResultOutput.Exception("平台租户禁止删除");
|
|
|
+ }
|
|
|
+
|
|
|
+ //删除角色权限
|
|
|
+ await _rolePermissionRepository.Where(a => a.Role.TenantId == id).DisableGlobalFilter(FilterNames.Tenant).ToDelete().ExecuteAffrowsAsync();
|
|
|
|
|
|
- //删除角色权限
|
|
|
- await _rolePermissionRepository.Where(a => a.Role.TenantId == id).DisableGlobalFilter(FilterNames.Tenant).ToDelete().ExecuteAffrowsAsync();
|
|
|
+ //删除用户角色
|
|
|
+ await _userRoleRepository.Where(a => a.User.TenantId == id).DisableGlobalFilter(FilterNames.Tenant).ToDelete().ExecuteAffrowsAsync();
|
|
|
|
|
|
- //删除用户角色
|
|
|
- await _userRoleRepository.Where(a => a.User.TenantId == id).DisableGlobalFilter(FilterNames.Tenant).ToDelete().ExecuteAffrowsAsync();
|
|
|
+ //删除员工
|
|
|
+ await _userStaffRepository.Where(a => a.TenantId == id).DisableGlobalFilter(FilterNames.Tenant).ToDelete().ExecuteAffrowsAsync();
|
|
|
|
|
|
- //删除员工
|
|
|
- await _userStaffRepository.Where(a => a.TenantId == id).DisableGlobalFilter(FilterNames.Tenant).ToDelete().ExecuteAffrowsAsync();
|
|
|
+ //删除用户部门
|
|
|
+ await _userOrgRepository.Where(a => a.User.TenantId == id).DisableGlobalFilter(FilterNames.Tenant).ToDelete().ExecuteAffrowsAsync();
|
|
|
|
|
|
- //删除用户部门
|
|
|
- await _userOrgRepository.Where(a => a.User.TenantId == id).DisableGlobalFilter(FilterNames.Tenant).ToDelete().ExecuteAffrowsAsync();
|
|
|
+ //删除部门
|
|
|
+ await _orgRepository.Where(a => a.TenantId == id).DisableGlobalFilter(FilterNames.Tenant).ToDelete().ExecuteAffrowsAsync();
|
|
|
|
|
|
- //删除用户
|
|
|
- await _userRepository.Where(a => a.TenantId == id && a.Type != UserType.Member).DisableGlobalFilter(FilterNames.Tenant).ToDelete().ExecuteAffrowsAsync();
|
|
|
+ //删除用户
|
|
|
+ await _userRepository.Where(a => a.TenantId == id && a.Type != UserType.Member).DisableGlobalFilter(FilterNames.Tenant).ToDelete().ExecuteAffrowsAsync();
|
|
|
|
|
|
- //删除角色
|
|
|
- await _roleRepository.Where(a => a.TenantId == id).DisableGlobalFilter(FilterNames.Tenant).ToDelete().ExecuteAffrowsAsync();
|
|
|
+ //删除角色
|
|
|
+ await _roleRepository.Where(a => a.TenantId == id).DisableGlobalFilter(FilterNames.Tenant).ToDelete().ExecuteAffrowsAsync();
|
|
|
|
|
|
- //删除租户
|
|
|
- await _tenantRepository.DeleteAsync(id);
|
|
|
+ //删除租户
|
|
|
+ await _tenantRepository.DeleteAsync(id);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -259,20 +428,26 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
|
|
|
[AdminTransaction]
|
|
|
public virtual async Task SoftDeleteAsync(long id)
|
|
|
{
|
|
|
- var tenantType = await _tenantRepository.Select.WhereDynamic(id).ToOneAsync(a => a.TenantType);
|
|
|
- if (tenantType == TenantType.Platform)
|
|
|
+ using (_tenantRepository.DataFilter.Disable(FilterNames.Tenant))
|
|
|
{
|
|
|
- throw ResultOutput.Exception("平台租户禁止删除");
|
|
|
- }
|
|
|
+ var tenantType = await _tenantRepository.Select.WhereDynamic(id).ToOneAsync(a => a.TenantType);
|
|
|
+ if (tenantType == TenantType.Platform)
|
|
|
+ {
|
|
|
+ throw ResultOutput.Exception("平台租户禁止删除");
|
|
|
+ }
|
|
|
+
|
|
|
+ //删除部门
|
|
|
+ await _orgRepository.SoftDeleteAsync(a => a.TenantId == id, FilterNames.Tenant);
|
|
|
|
|
|
- //删除用户
|
|
|
- await _userRepository.SoftDeleteAsync(a => a.TenantId == id && a.Type != UserType.Member, FilterNames.Tenant);
|
|
|
+ //删除用户
|
|
|
+ await _userRepository.SoftDeleteAsync(a => a.TenantId == id && a.Type != UserType.Member, FilterNames.Tenant);
|
|
|
|
|
|
- //删除角色
|
|
|
- await _roleRepository.SoftDeleteAsync(a => a.TenantId == id, FilterNames.Tenant);
|
|
|
+ //删除角色
|
|
|
+ await _roleRepository.SoftDeleteAsync(a => a.TenantId == id, FilterNames.Tenant);
|
|
|
|
|
|
- //删除租户
|
|
|
- var result = await _tenantRepository.SoftDeleteAsync(id);
|
|
|
+ //删除租户
|
|
|
+ var result = await _tenantRepository.SoftDeleteAsync(id);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -283,20 +458,26 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
|
|
|
[AdminTransaction]
|
|
|
public virtual async Task BatchSoftDeleteAsync(long[] ids)
|
|
|
{
|
|
|
- var tenantType = await _tenantRepository.Select.WhereDynamic(ids).ToOneAsync(a => a.TenantType);
|
|
|
- if (tenantType == TenantType.Platform)
|
|
|
+ using (_tenantRepository.DataFilter.Disable(FilterNames.Tenant))
|
|
|
{
|
|
|
- throw ResultOutput.Exception("平台租户禁止删除");
|
|
|
- }
|
|
|
+ var tenantType = await _tenantRepository.Select.WhereDynamic(ids).ToOneAsync(a => a.TenantType);
|
|
|
+ if (tenantType == TenantType.Platform)
|
|
|
+ {
|
|
|
+ throw ResultOutput.Exception("平台租户禁止删除");
|
|
|
+ }
|
|
|
|
|
|
- //删除用户
|
|
|
- await _userRepository.SoftDeleteAsync(a => ids.Contains(a.TenantId.Value) && a.Type != UserType.Member, FilterNames.Tenant);
|
|
|
+ //删除部门
|
|
|
+ await _orgRepository.SoftDeleteAsync(a => ids.Contains(a.TenantId.Value), FilterNames.Tenant);
|
|
|
|
|
|
- //删除角色
|
|
|
- await _roleRepository.SoftDeleteAsync(a => ids.Contains(a.TenantId.Value), FilterNames.Tenant);
|
|
|
+ //删除用户
|
|
|
+ await _userRepository.SoftDeleteAsync(a => ids.Contains(a.TenantId.Value) && a.Type != UserType.Member, FilterNames.Tenant);
|
|
|
|
|
|
- //删除租户
|
|
|
- var result = await _tenantRepository.SoftDeleteAsync(ids);
|
|
|
+ //删除角色
|
|
|
+ await _roleRepository.SoftDeleteAsync(a => ids.Contains(a.TenantId.Value), FilterNames.Tenant);
|
|
|
+
|
|
|
+ //删除租户
|
|
|
+ var result = await _tenantRepository.SoftDeleteAsync(ids);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
zhontai