From ed9d500e5d4d6288d9215713f3f329cfda2800bf 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 09:07:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(system):=20=E4=BF=AE=E6=AD=A3=E8=B6=85?= =?UTF-8?q?=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98=E6=A0=87=E8=AF=86=E5=8F=8A?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 TenantMapper.xml 中用户表连接更新为使用 gxwebsoft_core.sys_user - 修改关联查询条件，使用 is_super_admin 替代 is_admin 标识 - 调整 User 实体中 isSuperAdmin 字段，移除@TableField注解以确保正确映射 --- src/main/java/com/gxwebsoft/common/system/entity/User.java | 1 - .../com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java index 1217f69..432ae6f 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/User.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java @@ -197,7 +197,6 @@ public class User implements UserDetails { private Integer isOrganizationAdmin; @Schema(description = "是否超级管理员") - @TableField(exist = false) private Boolean isSuperAdmin; @Schema(description = "租户管理员ID") 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 3af2e0b..8765748 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 @@ -8,7 +8,7 @@ u.phone,u.username FROM sys_tenant a LEFT JOIN sys_company b ON a.tenant_id = b.tenant_id - LEFT JOIN sys_user u ON u.tenant_id = a.tenant_id AND u.is_admin = 1 AND u.deleted = 0 + LEFT JOIN gxwebsoft_core.sys_user u ON u.tenant_id = a.tenant_id AND u.is_super_admin = 1 AND u.deleted = 0 AND a.tenant_id = #{param.tenantId}