From f21ec12bcf030589ae08b7e1738ca32fe30edc7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 17 Oct 2024 19:45:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gxwebsoft/common/system/mapper/xml/CompanyMapper.xml    | 1 +
 .../com/gxwebsoft/common/system/mapper/xml/UserMapper.xml   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml
index ab043e3..012640d 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml
@@ -126,6 +126,7 @@
               AND (a.company_name LIKE CONCAT('%', #{param.keywords}, '%')
               OR a.short_name LIKE CONCAT('%', #{param.keywords}, '%')
               OR a.tenant_id = #{param.keywords}
+              OR a.phone = #{param.keywords}
               OR a.domain LIKE CONCAT('%', #{param.keywords}, '%')
               )
             </if>
diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
index 0b760d0..4a19718 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
@@ -28,7 +28,9 @@
         b.organization_name,
         c.dict_data_name sex_name,
         e.name as groupName,
-        f.name as gradeName
+        f.name as gradeName,
+        g.company_name as companyName,g.company_logo as logo,
+        t.tenant_name as tenantName
         FROM sys_user a
         LEFT JOIN sys_organization b ON a.organization_id = b.organization_id
         LEFT JOIN (
@@ -39,6 +41,8 @@
         ) d ON a.user_id = d.user_id
         LEFT JOIN sys_user_group e ON a.group_id = e.group_id
         LEFT JOIN sys_user_grade f ON a.grade_id = f.grade_id
+        LEFT JOIN sys_tenant t ON a.tenant_id = t.tenant_id
+        LEFT JOIN sys_company g ON g.tenant_id = t.tenant_id
         <where>
             <if test="param.userId != null">
                 AND a.user_id = #{param.userId}