From e865f0b540962b0195420b2326fe331288fcbe8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 7 Feb 2023 23:36:36 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E7=A7=9F=E6=88=B7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/service/impl/SysTenantServiceImpl.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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