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}