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}