修复已知问题
This commit is contained in:
@@ -126,6 +126,7 @@
|
|||||||
AND (a.company_name LIKE CONCAT('%', #{param.keywords}, '%')
|
AND (a.company_name LIKE CONCAT('%', #{param.keywords}, '%')
|
||||||
OR a.short_name LIKE CONCAT('%', #{param.keywords}, '%')
|
OR a.short_name LIKE CONCAT('%', #{param.keywords}, '%')
|
||||||
OR a.tenant_id = #{param.keywords}
|
OR a.tenant_id = #{param.keywords}
|
||||||
|
OR a.phone = #{param.keywords}
|
||||||
OR a.domain LIKE CONCAT('%', #{param.keywords}, '%')
|
OR a.domain LIKE CONCAT('%', #{param.keywords}, '%')
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
|
|||||||
@@ -28,7 +28,9 @@
|
|||||||
b.organization_name,
|
b.organization_name,
|
||||||
c.dict_data_name sex_name,
|
c.dict_data_name sex_name,
|
||||||
e.name as groupName,
|
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
|
FROM sys_user a
|
||||||
LEFT JOIN sys_organization b ON a.organization_id = b.organization_id
|
LEFT JOIN sys_organization b ON a.organization_id = b.organization_id
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
@@ -39,6 +41,8 @@
|
|||||||
) d ON a.user_id = d.user_id
|
) 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_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_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>
|
<where>
|
||||||
<if test="param.userId != null">
|
<if test="param.userId != null">
|
||||||
AND a.user_id = #{param.userId}
|
AND a.user_id = #{param.userId}
|
||||||
|
|||||||
Reference in New Issue
Block a user