opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-21 02:25:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 优化 创建租户逻辑

Browse Source
This commit is contained in:
疯狂的狮子Li 2023-02-07 23:36:36 +08:00
parent 351af6a524
commit e865f0b540
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java
View File

@ -114,9 +114,10 @@ public class SysTenantServiceImpl implements ISysTenantService {
String tenantId = generateTenantId(tenantIds); String tenantId = generateTenantId(tenantIds);
add.setTenantId(tenantId); add.setTenantId(tenantId);
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (flag) { if (!flag) {
bo.setId(add.getId()); throw new ServiceException("创建租户失败");
} }
bo.setId(add.getId());
// 根据套餐创建角色 // 根据套餐创建角色
Long roleId = createTenantRole(tenantId, bo.getPackageId()); Long roleId = createTenantRole(tenantId, bo.getPackageId());
@ -125,6 +126,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
SysDept dept = new SysDept(); SysDept dept = new SysDept();
dept.setTenantId(tenantId); dept.setTenantId(tenantId);
dept.setDeptName(bo.getCompanyName()); dept.setDeptName(bo.getCompanyName());
dept.setParentId(Constants.TOP_PARENT_ID);
dept.setAncestors(Constants.TOP_PARENT_ID.toString()); dept.setAncestors(Constants.TOP_PARENT_ID.toString());
sysDeptMapper.insert(dept); sysDeptMapper.insert(dept);
Long deptId = dept.getDeptId(); Long deptId = dept.getDeptId();
@ -150,7 +152,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
userRole.setRoleId(roleId); userRole.setRoleId(roleId);
sysUserRoleMapper.insert(userRole); sysUserRoleMapper.insert(userRole);
return flag; return true;
} }
/** /**
@ -176,7 +178,6 @@ public class SysTenantServiceImpl implements ISysTenantService {
* @param packageId 租户套餐id * @param packageId 租户套餐id
* @return 角色id * @return 角色id
*/ */
@Transactional(rollbackFor = Exception.class)
public Long createTenantRole(String tenantId, Long packageId) { public Long createTenantRole(String tenantId, Long packageId) {
// 获取租户套餐 // 获取租户套餐
SysTenantPackage tenantPackage = sysTenantPackageMapper.selectById(packageId); SysTenantPackage tenantPackage = sysTenantPackageMapper.selectById(packageId);