From c3bd90f234bcb4de021385c441f7a4ebe6f9a0d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 27 Apr 2026 07:04:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(tenant):=20=E4=BF=AE=E5=A4=8D=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E5=88=9D=E5=A7=8B=E5=8C=96=E5=92=8C=E5=85=B3=E8=81=94?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - tenantService.initialization()返回新增Company对象并使用其tenantId赋值 - userParam及userParam1新增tenantId字段，使用新创建租户ID - Tenant实体新增username字段，支持用户名信息存储 - TenantMapper查询语句增加c.username字段关联查询 - TenantServiceImpl中超级管理员username设为随机UUID字符串，避免固定用户名冲突 --- .../gxwebsoft/common/system/controller/MainController.java | 4 +++- src/main/java/com/gxwebsoft/common/system/entity/Tenant.java | 4 ++++ .../com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml | 2 +- .../common/system/service/impl/TenantServiceImpl.java | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java index 459c32e..654c085 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java @@ -789,11 +789,12 @@ public class MainController extends BaseController { company.setShortName(tenantName); company.setTenantId(tenant.getTenantId()); company.setTemplateId(user.getTemplateId()); - tenantService.initialization(company); + final Company addCompany = tenantService.initialization(company); final UserParam userParam = new UserParam(); userParam.setIsAdmin(true); userParam.setPhone(phone); userParam.setTemplateId(user.getTemplateId()); + userParam.setTenantId(addCompany.getTenantId()); // 使用新创建的租户ID final User adminByPhone = userService.getAdminByPhone(userParam); // 设置过期时间 @@ -973,6 +974,7 @@ public class MainController extends BaseController { userParam1.setIsAdmin(true); userParam1.setPhone(phone); userParam1.setTemplateId(user.getTemplateId()); + userParam1.setTenantId(addCompany.getTenantId()); // 使用新创建的租户ID final User adminByPhone = userService.getAdminByPhone(userParam1); // 设置过期时间 diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java b/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java index e3d3849..3ba8201 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java @@ -96,6 +96,10 @@ public class Tenant implements Serializable { @TableField(exist = false) private Object date; + @Schema(description = "用户名") + @TableField(exist = false) + private String username; + @Schema(description = "手机号码") @TableField(exist = false) private String phone; diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml index df9d363..8391424 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*,b.company_name,b.company_logo as logo,b.admin_url,b.domain,b.free_domain,c.phone + SELECT a.*,b.company_name,b.company_logo as logo,b.admin_url,b.domain,b.free_domain,c.phone,c.username FROM sys_tenant a LEFT JOIN sys_company b ON a.tenant_id = b.tenant_id LEFT JOIN sys_user c ON a.user_id = c.user_id diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java index ba23291..1a8abae 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java @@ -105,7 +105,7 @@ public class TenantServiceImpl extends ServiceImpl impleme // 添加超级管理员 User superAdmin = new User(); - superAdmin.setUsername("superAdmin"); + superAdmin.setUsername(CommonUtil.randomUUID16()); // 使用随机用户名 superAdmin.setNickname(company.getShortName()); superAdmin.setPhone(company.getPhone()); superAdmin.setEmail(company.getEmail());