debug

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/MainAuditServiceImpl.java

@@ -178,13 +178,13 @@ public class MainAuditServiceImpl implements IMainAuditService {
         tenantBo.setEmail(companyApply.getOfficialAccount()); // 设置邮箱
 
         // 4. 创建租户
-        Boolean success = tenantService.insertByBo(tenantBo);
-        if (!success) {
+        String tenantId = tenantService.insertByBo(tenantBo);
+        if (StringUtils.isBlank(tenantId)) {
             throw new ServiceException("创建租户失败");
         }
 
         // 5. 更新企业申请表的 tenant_id 和 apply_status
-        companyApply.setTenantId(tenantBo.getTenantId());
+        companyApply.setTenantId(tenantId);
         companyApply.setApplyStatus(2); // 已通过
         companyApplyMapper.updateById(companyApply);
     }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java

@@ -10,6 +10,7 @@ import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.TenantConstants;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.encrypt.annotation.ApiEncrypt;
@@ -92,7 +93,7 @@ public class SysTenantController extends BaseController {
         if (!tenantService.checkCompanyNameUnique(bo)) {
             return R.fail("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在");
         }
-        return toAjax(TenantHelper.ignore(() -> tenantService.insertByBo(bo)));
+        return toAjax(TenantHelper.ignore(() -> StringUtils.isNotBlank(tenantService.insertByBo(bo))));
     }
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java

@@ -38,7 +38,7 @@ public interface ISysTenantService {
     /**
      * 新增租户
      */
-    Boolean insertByBo(SysTenantBo bo);
+    String insertByBo(SysTenantBo bo);
 
     /**
      * 修改租户

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java

@@ -136,7 +136,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean insertByBo(SysTenantBo bo) {
+    public String insertByBo(SysTenantBo bo) {
         SysTenant add = MapstructUtils.convert(bo, SysTenant.class);
 
         // 获取所有租户编号
@@ -239,7 +239,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
 //            // 新增租户流程定义
 //            workflowService.syncDef(tenantId);
 //        }
-        return true;
+        return tenantId;
     }
 
     /**