From eb9bfd167e3ed2f9a19026a9f6a4e60840c92630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Tue, 21 Jul 2026 14:29:41 +0800 Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E4=BC=98=E5=8C=96=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将Tenant实体中的超级管理员用户ID字段名从superAdminUserId修改为ownerId - 更新字段的Schema描述，将“超级管理员用户ID”改为“超级管理员UID” - 修改TenantMapper.xml中关联查询SQL对应的字段别名为ownerId以保持一致 - 保持原有逻辑和功能不变，提升字段命名语义清晰度 --- src/main/java/com/gxwebsoft/common/system/entity/Tenant.java | 4 ++-- .../com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 c5cfc5e..eff0431 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java @@ -104,9 +104,9 @@ public class Tenant implements Serializable { @TableField(exist = false) private String phone; - @Schema(description = "超级管理员用户ID") + @Schema(description = "超级管理员UID") @TableField(exist = false) - private Integer superAdminUserId; + private Integer ownerId; @Schema(description = "管理地址") @TableField(exist = false) 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 34e432a..f869a67 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 @@ -5,7 +5,7 @@ SELECT a.*,b.company_name,b.company_logo as logo,b.admin_url,b.domain,b.free_domain, - u.phone,u.username,u.user_id as superAdminUserId + u.phone,u.username,u.user_id as ownerId FROM sys_tenant a LEFT JOIN sys_company b ON a.tenant_id = b.tenant_id LEFT JOIN gxwebsoft_core.sys_user u ON u.tenant_id = a.tenant_id AND u.is_super_admin = 1 AND u.deleted = 0