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 6f770d0..2ca889e 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,19 +4,15 @@ - SELECT a.*,b.company_name,b.company_logo as logo,b.admin_url,b.domain,b.free_domain,c.phone,c.username + SELECT a.*,b.company_name,b.company_logo as logo,b.admin_url,b.domain,b.free_domain, + u.phone,u.username FROM sys_tenant a LEFT JOIN sys_company b ON a.tenant_id = b.tenant_id - LEFT JOIN ( - SELECT tenant_id, phone, username - FROM ( - SELECT tenant_id, phone, username, - ROW_NUMBER() OVER(PARTITION BY tenant_id ORDER BY user_id) AS rn - FROM sys_user - WHERE is_admin = 1 AND deleted = 0 - ) t - WHERE rn = 1 - ) c ON a.tenant_id = c.tenant_id + LEFT JOIN sys_user u ON u.tenant_id = a.tenant_id AND u.is_admin = 1 + AND u.user_id = ( + SELECT MIN(user_id) FROM sys_user + WHERE tenant_id = a.tenant_id AND is_admin = 1 AND deleted = 0 + ) AND a.tenant_id = #{param.tenantId}